Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900 2025-04-05 21:29:35 +03:00
commit 5e55028d84
290 changed files with 1758 additions and 1177 deletions

View file

@ -251,3 +251,15 @@ fd14c067813572afc03ddbf7cdedc3eab5a59954
# treewide format of all Nix files
374e6bcc403e02a35e07b650463c01a52b13a7c8 # !autorebase nix-shell --run treefmt
# nix: nixfmt-rfc-style
a4f7e161b380b35b2f7bc432659a95fd71254ad8
0812c9a321003c924868051d2b2e1934e8880f3f
34f269c14ac18d89ddee9a8f54b1ca92a85bbcc6
062c34cdace499aa44f0fa6ca6f2ca71769f6c43
# haskellPackages.hercules-ci-agent (cabal2nix -> nixfmt-rfc-style)
9314da7ee8d2aedfb15193b8c489da51efe52bb5
# nix-builder-vm: nixfmt-rfc-style
a034fb50f79816c6738fb48b48503b09ea3b0132

View file

@ -511,12 +511,12 @@ in
gemstash = handleTest ./gemstash.nix { };
geoclue2 = runTest ./geoclue2.nix;
geoserver = runTest ./geoserver.nix;
gerrit = handleTest ./gerrit.nix { };
gerrit = runTest ./gerrit.nix;
geth = handleTest ./geth.nix { };
ghostunnel = handleTest ./ghostunnel.nix { };
gitdaemon = handleTest ./gitdaemon.nix { };
gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; };
github-runner = handleTest ./github-runner.nix { };
github-runner = runTest ./github-runner.nix;
gitlab = runTest ./gitlab.nix;
gitolite = handleTest ./gitolite.nix { };
gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix { };
@ -524,7 +524,7 @@ in
glances = runTest ./glances.nix;
glitchtip = runTest ./glitchtip.nix;
glusterfs = handleTest ./glusterfs.nix { };
gnome = handleTest ./gnome.nix { };
gnome = runTest ./gnome.nix;
gnome-extensions = handleTest ./gnome-extensions.nix { };
gnome-flashback = handleTest ./gnome-flashback.nix { };
gnome-xorg = handleTest ./gnome-xorg.nix { };
@ -675,7 +675,7 @@ in
keycloak = discoverTests (import ./keycloak.nix);
keyd = handleTest ./keyd.nix { };
keymap = handleTest ./keymap.nix { };
kimai = handleTest ./kimai.nix { };
kimai = runTest ./kimai.nix;
kmonad = runTest ./kmonad.nix;
knot = runTest ./knot.nix;
komga = handleTest ./komga.nix { };
@ -741,7 +741,7 @@ in
magnetico = handleTest ./magnetico.nix { };
mailcatcher = runTest ./mailcatcher.nix;
mailhog = handleTest ./mailhog.nix { };
mailpit = handleTest ./mailpit.nix { };
mailpit = runTest ./mailpit.nix;
mailman = handleTest ./mailman.nix { };
man = handleTest ./man.nix { };
mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
@ -807,7 +807,7 @@ in
mpv = runTest ./mpv.nix;
mtp = handleTest ./mtp.nix { };
multipass = handleTest ./multipass.nix { };
mumble = handleTest ./mumble.nix { };
mumble = runTest ./mumble.nix;
# Fails on aarch64-linux at the PDF creation step - need to debug this on an
# aarch64 machine..
musescore = handleTestOn [ "x86_64-linux" ] ./musescore.nix { };

View file

@ -1,57 +1,55 @@
import ./make-test-python.nix (
{ pkgs, ... }:
{ pkgs, ... }:
{
name = "gerrit";
{
name = "gerrit";
meta = with pkgs.lib.maintainers; {
maintainers = [
flokli
zimbatm
];
};
meta = with pkgs.lib.maintainers; {
maintainers = [
flokli
zimbatm
];
};
nodes = {
server =
{ config, pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [
80
2222
nodes = {
server =
{ config, pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [
80
2222
];
services.gerrit = {
enable = true;
serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0";
listenAddress = "[::]:80";
jvmHeapLimit = "1g";
builtinPlugins = [
"hooks"
"webhooks"
];
services.gerrit = {
enable = true;
serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0";
listenAddress = "[::]:80";
jvmHeapLimit = "1g";
builtinPlugins = [
"hooks"
"webhooks"
];
settings = {
gerrit.canonicalWebUrl = "http://server";
sshd.listenAddress = "[::]:2222";
sshd.advertisedAddress = "[::]:2222";
};
settings = {
gerrit.canonicalWebUrl = "http://server";
sshd.listenAddress = "[::]:2222";
sshd.advertisedAddress = "[::]:2222";
};
};
};
client =
{ ... }:
{
};
};
client =
{ ... }:
{
};
};
testScript = ''
start_all()
server.wait_for_unit("gerrit.service")
server.wait_for_open_port(80)
client.succeed("curl http://server")
testScript = ''
start_all()
server.wait_for_unit("gerrit.service")
server.wait_for_open_port(80)
client.succeed("curl http://server")
server.wait_for_open_port(2222)
client.succeed("nc -z server 2222")
'';
}
)
server.wait_for_open_port(2222)
client.succeed("nc -z server 2222")
'';
}

View file

@ -1,49 +1,47 @@
import ./make-test-python.nix (
{ pkgs, ... }:
{
name = "github-runner";
meta = with pkgs.lib.maintainers; {
maintainers = [ veehaitch ];
};
nodes.machine =
{ pkgs, ... }:
{
services.github-runners.test = {
enable = true;
url = "https://github.com/yaxitech";
tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
};
services.github-runners.test-disabled = {
enable = false;
url = "https://github.com/yaxitech";
tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
};
systemd.services.dummy-github-com = {
wantedBy = [ "multi-user.target" ];
before = [ "github-runner-test.service" ];
script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect";
};
networking.hosts."127.0.0.1" = [ "api.github.com" ];
{ pkgs, ... }:
{
name = "github-runner";
meta = with pkgs.lib.maintainers; {
maintainers = [ veehaitch ];
};
nodes.machine =
{ pkgs, ... }:
{
services.github-runners.test = {
enable = true;
url = "https://github.com/yaxitech";
tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
};
testScript = ''
start_all()
services.github-runners.test-disabled = {
enable = false;
url = "https://github.com/yaxitech";
tokenFile = builtins.toFile "github-runner.token" "not-so-secret";
};
machine.wait_for_unit("dummy-github-com")
systemd.services.dummy-github-com = {
wantedBy = [ "multi-user.target" ];
before = [ "github-runner-test.service" ];
script = "${pkgs.netcat}/bin/nc -Fl 443 | true && touch /tmp/registration-connect";
};
networking.hosts."127.0.0.1" = [ "api.github.com" ];
};
try:
machine.wait_for_unit("github-runner-test")
except Exception:
pass
testScript = ''
start_all()
out = machine.succeed("journalctl -u github-runner-test")
assert "Self-hosted runner registration" in out, "did not read runner registration header"
machine.wait_for_unit("dummy-github-com")
machine.wait_until_succeeds("test -f /tmp/registration-connect")
try:
machine.wait_for_unit("github-runner-test")
except Exception:
pass
machine.fail("systemctl list-unit-files | grep test-disabled")
'';
}
)
out = machine.succeed("journalctl -u github-runner-test")
assert "Self-hosted runner registration" in out, "did not read runner registration header"
machine.wait_until_succeeds("test -f /tmp/registration-connect")
machine.fail("systemctl list-unit-files | grep test-disabled")
'';
}

View file

@ -1,103 +1,101 @@
import ./make-test-python.nix (
{ pkgs, lib, ... }:
{
name = "gnome";
meta.maintainers = lib.teams.gnome.members;
{ pkgs, lib, ... }:
{
name = "gnome";
meta.maintainers = lib.teams.gnome.members;
nodes.machine =
{ ... }:
nodes.machine =
{ ... }:
{
imports = [ ./common/user-account.nix ];
{
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager = {
gdm.enable = true;
gdm.debug = true;
};
services.displayManager.autoLogin = {
enable = true;
user = "alice";
};
services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.debug = true;
systemd.user.services = {
"org.gnome.Shell@wayland" = {
serviceConfig = {
ExecStart = [
# Clear the list before overriding it.
""
# Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess.
"${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
];
};
};
};
services.xserver.enable = true;
services.xserver.displayManager = {
gdm.enable = true;
gdm.debug = true;
};
testScript =
{ nodes, ... }:
let
# Keep line widths somewhat manageable
user = nodes.machine.users.users.alice;
uid = toString user.uid;
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
# Run a command in the appropriate user environment
run = command: "su - ${user.name} -c '${bus} ${command}'";
services.displayManager.autoLogin = {
enable = true;
user = "alice";
};
# Call javascript in gnome shell, returns a tuple (success, output), where
# `success` is true if the dbus call was successful and output is what the
# javascript evaluates to.
eval =
command:
run "gdbus call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval ${command}";
services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.debug = true;
# False when startup is done
startingUp = eval "Main.layoutManager._startingUp";
systemd.user.services = {
"org.gnome.Shell@wayland" = {
serviceConfig = {
ExecStart = [
# Clear the list before overriding it.
""
# Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess.
"${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
];
};
};
};
# Start Console
launchConsole = run "gapplication launch org.gnome.Console";
};
# Hopefully Console's wm class
wmClass = eval "global.display.focus_window.wm_class";
in
''
with subtest("Login to GNOME with GDM"):
# wait for gdm to start
machine.wait_for_unit("display-manager.service")
# wait for the wayland server
machine.wait_for_file("/run/user/${uid}/wayland-0")
# wait for alice to be logged in
machine.wait_for_unit("default.target", "${user.name}")
# check that logging in has given the user ownership of devices
assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
testScript =
{ nodes, ... }:
let
# Keep line widths somewhat manageable
user = nodes.machine.users.users.alice;
uid = toString user.uid;
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
# Run a command in the appropriate user environment
run = command: "su - ${user.name} -c '${bus} ${command}'";
with subtest("Wait for GNOME Shell"):
# correct output should be (true, 'false')
machine.wait_until_succeeds(
"${startingUp} | grep -q 'true,..false'"
)
# Call javascript in gnome shell, returns a tuple (success, output), where
# `success` is true if the dbus call was successful and output is what the
# javascript evaluates to.
eval =
command:
run "gdbus call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval ${command}";
with subtest("Open Console"):
# Close the Activities view so that Shell can correctly track the focused window.
machine.send_key("esc")
# False when startup is done
startingUp = eval "Main.layoutManager._startingUp";
machine.succeed(
"${launchConsole}"
)
# correct output should be (true, '"org.gnome.Console"')
machine.wait_until_succeeds(
"${wmClass} | grep -q 'true,...org.gnome.Console'"
)
machine.sleep(20)
machine.screenshot("screen")
'';
}
)
# Start Console
launchConsole = run "gapplication launch org.gnome.Console";
# Hopefully Console's wm class
wmClass = eval "global.display.focus_window.wm_class";
in
''
with subtest("Login to GNOME with GDM"):
# wait for gdm to start
machine.wait_for_unit("display-manager.service")
# wait for the wayland server
machine.wait_for_file("/run/user/${uid}/wayland-0")
# wait for alice to be logged in
machine.wait_for_unit("default.target", "${user.name}")
# check that logging in has given the user ownership of devices
assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
with subtest("Wait for GNOME Shell"):
# correct output should be (true, 'false')
machine.wait_until_succeeds(
"${startingUp} | grep -q 'true,..false'"
)
with subtest("Open Console"):
# Close the Activities view so that Shell can correctly track the focused window.
machine.send_key("esc")
machine.succeed(
"${launchConsole}"
)
# correct output should be (true, '"org.gnome.Console"')
machine.wait_until_succeeds(
"${wmClass} | grep -q 'true,...org.gnome.Console'"
)
machine.sleep(20)
machine.screenshot("screen")
'';
}

View file

@ -1,23 +1,21 @@
import ./make-test-python.nix (
{ lib, ... }:
{ lib, ... }:
{
name = "kimai";
meta.maintainers = with lib.maintainers; [ peat-psuwit ];
{
name = "kimai";
meta.maintainers = with lib.maintainers; [ peat-psuwit ];
nodes.machine =
{ ... }:
{
services.kimai.sites."localhost" = {
database.createLocally = true;
};
nodes.machine =
{ ... }:
{
services.kimai.sites."localhost" = {
database.createLocally = true;
};
};
testScript = ''
machine.wait_for_unit("phpfpm-kimai-localhost.service")
machine.wait_for_unit("nginx.service")
machine.wait_for_open_port(80)
machine.succeed("curl -v --location --fail http://localhost/")
'';
}
)
testScript = ''
machine.wait_for_unit("phpfpm-kimai-localhost.service")
machine.wait_for_unit("nginx.service")
machine.wait_for_open_port(80)
machine.succeed("curl -v --location --fail http://localhost/")
'';
}

View file

@ -1,35 +1,33 @@
import ./make-test-python.nix (
{ lib, ... }:
{
name = "mailpit";
meta.maintainers = lib.teams.flyingcircus.members;
{ lib, ... }:
{
name = "mailpit";
meta.maintainers = lib.teams.flyingcircus.members;
nodes.machine =
{ pkgs, ... }:
{
services.mailpit.instances.default = { };
nodes.machine =
{ pkgs, ... }:
{
services.mailpit.instances.default = { };
environment.systemPackages = with pkgs; [ swaks ];
};
environment.systemPackages = with pkgs; [ swaks ];
};
testScript = ''
start_all()
testScript = ''
start_all()
from json import loads
from json import loads
machine.wait_for_unit("mailpit-default.service")
machine.wait_for_open_port(1025)
machine.wait_for_open_port(8025)
machine.succeed(
'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
)
machine.wait_for_unit("mailpit-default.service")
machine.wait_for_open_port(1025)
machine.wait_for_open_port(8025)
machine.succeed(
'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
)
received = loads(machine.succeed("curl http://localhost:8025/api/v1/messages"))
assert received['total'] == 1
message = received["messages"][0]
assert len(message['To']) == 1
assert message['To'][0]['Address'] == 'root@example.org'
assert "this is the body of the email" in message['Snippet']
'';
}
)
received = loads(machine.succeed("curl http://localhost:8025/api/v1/messages"))
assert received['total'] == 1
message = received["messages"][0]
assert len(message['To']) == 1
assert message['To'][0]['Address'] == 'root@example.org'
assert "this is the body of the email" in message['Snippet']
'';
}

View file

@ -1,95 +1,93 @@
import ./make-test-python.nix (
{ pkgs, ... }:
{ pkgs, ... }:
let
client =
{ pkgs, ... }:
let
client =
{ pkgs, ... }:
{
imports = [ ./common/x11.nix ];
environment.systemPackages = [ pkgs.mumble ];
};
# outside of tests, this file should obviously not come from the nix store
envFile = pkgs.writeText "nixos-test-mumble-murmurd.env" ''
MURMURD_PASSWORD=testpassword
'';
in
{
name = "mumble";
meta = with pkgs.lib.maintainers; {
maintainers = [ thoughtpolice ];
};
nodes = {
server =
{ config, ... }:
{
imports = [ ./common/x11.nix ];
environment.systemPackages = [ pkgs.mumble ];
security.apparmor.enable = true;
services.murmur.enable = true;
services.murmur.registerName = "NixOS tests";
services.murmur.password = "$MURMURD_PASSWORD";
services.murmur.environmentFile = envFile;
networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
};
# outside of tests, this file should obviously not come from the nix store
envFile = pkgs.writeText "nixos-test-mumble-murmurd.env" ''
MURMURD_PASSWORD=testpassword
'';
client1 = client;
client2 = client;
};
in
{
name = "mumble";
meta = with pkgs.lib.maintainers; {
maintainers = [ thoughtpolice ];
};
testScript = ''
start_all()
nodes = {
server =
{ config, ... }:
{
security.apparmor.enable = true;
services.murmur.enable = true;
services.murmur.registerName = "NixOS tests";
services.murmur.password = "$MURMURD_PASSWORD";
services.murmur.environmentFile = envFile;
networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
};
server.wait_for_unit("murmur.service")
client1.wait_for_x()
client2.wait_for_x()
client1 = client;
client2 = client;
};
client1.execute("mumble mumble://client1:testpassword\@server/test >&2 &")
client2.execute("mumble mumble://client2:testpassword\@server/test >&2 &")
testScript = ''
start_all()
# cancel client audio configuration
client1.wait_for_window(r"Audio Tuning Wizard")
client2.wait_for_window(r"Audio Tuning Wizard")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_key("esc")
client2.send_key("esc")
server.wait_for_unit("murmur.service")
client1.wait_for_x()
client2.wait_for_x()
# cancel client cert configuration
client1.wait_for_window(r"Certificate Management")
client2.wait_for_window(r"Certificate Management")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_key("esc")
client2.send_key("esc")
client1.execute("mumble mumble://client1:testpassword\@server/test >&2 &")
client2.execute("mumble mumble://client2:testpassword\@server/test >&2 &")
# accept server certificate
client1.wait_for_window(r"^Mumble$")
client2.wait_for_window(r"^Mumble$")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_chars("y")
client2.send_chars("y")
server.sleep(5) # wait because mumble is slow to register event handlers
# cancel client audio configuration
client1.wait_for_window(r"Audio Tuning Wizard")
client2.wait_for_window(r"Audio Tuning Wizard")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_key("esc")
client2.send_key("esc")
# sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again
client1.send_key("alt-tab")
client2.send_key("alt-tab")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_chars("y")
client2.send_chars("y")
# cancel client cert configuration
client1.wait_for_window(r"Certificate Management")
client2.wait_for_window(r"Certificate Management")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_key("esc")
client2.send_key("esc")
# Find clients in logs
server.wait_until_succeeds(
"journalctl -eu murmur -o cat | grep -q 'client1.\+Authenticated'"
)
server.wait_until_succeeds(
"journalctl -eu murmur -o cat | grep -q 'client2.\+Authenticated'"
)
# accept server certificate
client1.wait_for_window(r"^Mumble$")
client2.wait_for_window(r"^Mumble$")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_chars("y")
client2.send_chars("y")
server.sleep(5) # wait because mumble is slow to register event handlers
server.sleep(5) # wait to get screenshot
client1.screenshot("screen1")
client2.screenshot("screen2")
# sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again
client1.send_key("alt-tab")
client2.send_key("alt-tab")
server.sleep(5) # wait because mumble is slow to register event handlers
client1.send_chars("y")
client2.send_chars("y")
# Find clients in logs
server.wait_until_succeeds(
"journalctl -eu murmur -o cat | grep -q 'client1.\+Authenticated'"
)
server.wait_until_succeeds(
"journalctl -eu murmur -o cat | grep -q 'client2.\+Authenticated'"
)
server.sleep(5) # wait to get screenshot
client1.screenshot("screen1")
client2.screenshot("screen2")
# check if apparmor denied anything
server.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
'';
}
)
# check if apparmor denied anything
server.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
'';
}

View file

@ -13,18 +13,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "youtube-music";
version = "3.7.4";
version = "3.8.0";
src = fetchFromGitHub {
owner = "th-ch";
repo = "youtube-music";
rev = "v${finalAttrs.version}";
hash = "sha256-qzvfYxM5mxxujWE0SDUapmN+Px9NkP58e1UeLEtZ7bc=";
hash = "sha256-2oXHSYKqftuvPhBogPgl2RxajQZM12ch9ZrEX26wcjs=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-guD1yWFd+uO9H/egHS0PJ9HIIlF+wFS/98YtvjIzZW8=";
hash = "sha256-s3Ba7uxtJTDV5tRoLFD30VSL5M/nWHHQZkMc+2bM1wE=";
};
nativeBuildInputs = [

View file

@ -72,7 +72,7 @@ python3Packages.buildPythonApplication rec {
pytestCheckHook
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
preCheck =
let

View file

@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.tests = {

View file

@ -737,8 +737,8 @@ let
mktplcRef = {
name = "vscode-intelephense-client";
publisher = "bmewburn";
version = "1.14.3";
hash = "sha256-YmrE0HQlqtuFqD3CDuU5SHnvDbZsfZWEIAZLTkiNXtE=";
version = "1.14.4";
hash = "sha256-WBtaRLAdE2Ttlq4fAS2kI3d0dUAVB+CTdksiSILJ4hY=";
};
meta = {
description = "PHP code intelligence for Visual Studio Code";

View file

@ -194,7 +194,7 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "-h" ];
versionCheckProgramArg = "-h";
passthru.updateScript = writeScript "mame-update-script" ''
#!/usr/bin/env nix-shell

View file

@ -110,7 +110,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -90,7 +90,7 @@ buildGoModule rec {
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "version" ];
versionCheckProgramArg = "version";
passthru = {
tests = {

View file

@ -80,7 +80,7 @@ stdenv.mkDerivation {
doInstallCheck = true;
versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru = {
updateScript = ./update.sh;

View file

@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/air";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/avrogencpp";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = {
description = "C++ library which implements parts of the Avro Specification";

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = with lib; {
description = "Small binary that runs a list of commands in parallel and awaits termination";

View file

@ -28,7 +28,7 @@ buildGoModule rec {
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = {
description = "Azure Data Exporter for BloodHound";

View file

@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = lib.optionals withSound soundDependencies;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
postInstall =

View file

@ -49,7 +49,7 @@ buildNpmPackage rec {
'';
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -23,7 +23,7 @@ buildGoModule rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "-version" ];
versionCheckProgramArg = "-version";
doInstallCheck = true;
passthru = {

View file

@ -33,7 +33,7 @@ buildGoModule rec {
];
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = with lib; {
homepage = "https://rtyley.github.io/bfg-repo-cleaner/";

View file

@ -1,6 +1,6 @@
# Generated by ./update.sh - do not update manually!
{
version = "1.16.3-2";
arm64-hash = "sha256-lVRo4w4+Hj1lDXtxUD0DnerOGeV33tdG8iZZnVWtVjc=";
x86_64-hash = "sha256-PAQ7B8jVDwb1qVJLFFSylL7Oh95Fe8LbgD0OcC1Xez8=";
version = "1.16.3-3";
arm64-hash = "sha256-tZlTNK3kBvIjYARQO7YSj/dbQ0iCuPeWM7+XYFYg8/M=";
x86_64-hash = "sha256-o3QP3gfotqRisN6tCch6JFlf8jNVbv6XB8xAnQpYQqA=";
}

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "-v" ];
versionCheckProgramArg = "-v";
passthru = {
updateScript = gitUpdater { rev-prefix = "v"; };

View file

@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
doCheck = false;

View file

@ -30,7 +30,7 @@ buildGoModule (finalAttrs: {
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/bsky";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
nativeBuildInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };

View file

@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -25,7 +25,7 @@ buildRubyGem rec {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/bundler";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -0,0 +1,39 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
udev,
}:
rustPlatform.buildRustPackage {
pname = "cargo-embassy";
version = "0.3.4";
src = fetchFromGitHub {
owner = "adinack";
repo = "cargo-embassy";
# 0.3.4 with cargo.lock. Switch back
# to tag = when next version released
rev = "989a406387ebda89acd943c57e207d78eba600c1";
hash = "sha256-C8eFQFHYIj2P+zPOKLVBNX97UDVbbcdjbqh5n53ktCU=";
};
buildInputs = [
udev
];
nativeBuildInputs = [
pkg-config
];
cargoHash = "sha256-iLGoc6CKZGlq9bw1sL0jCVm9lGa0i/BXiseU1USGjfQ=";
useFetchCargoVendor = true;
meta = {
description = "Command line tool for creating Embassy projects";
homepage = "https://github.com/adinack/cargo-embassy";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.samw ];
mainProgram = "cargo-embassy";
};
}

View file

@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru = {
updateScript = nix-update-script { };

View file

@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = {
description = "Cargo plugin for showing a tree-like overview of a crate's modules";

View file

@ -29,7 +29,7 @@ buildGoModule rec {
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = with lib; {
description = "Tool to communicate with Chaos DNS API";

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeInstallCheckPhaseInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = ./update.sh;

View file

@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru = {
inherit sources;

View file

@ -29,7 +29,7 @@ buildGoModule rec {
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = with lib; {
description = "Tool for listing assets from multiple cloud providers";

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/codeium_language_server";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = ./update.sh;

View file

@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
installCheckPhase = ''
runHook preInstallCheck

View file

@ -41,7 +41,7 @@ buildGoModule rec {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = {
description = "Gives criticality score for an open source project";

View file

@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -21,7 +21,7 @@ buildDotnetGlobalTool rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };

View file

@ -86,7 +86,7 @@ let
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -196,7 +196,7 @@ stdenv.mkDerivation rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = gitUpdater {

View file

@ -49,7 +49,7 @@ buildGoModule rec {
'';
doInstallCheck = true;
versionCheckProgramArg = [ "version" ];
versionCheckProgramArg = "version";
nativeInstallCheckInputs = [
versionCheckHook
];

View file

@ -68,7 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
pythonImportsCheck = [ "django_upgrade" ];

View file

@ -110,7 +110,7 @@ buildGoModule rec {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/dnote-cli";
versionCheckProgramArg = [ "version" ];
versionCheckProgramArg = "version";
# Fails on darwin:
# panic: initializing context: initializing files: creating the dnote dir:
# initializing config dir: creating a directory at /var/empty/.config/dnote: mkdir /var/empty: file exists

View file

@ -32,7 +32,7 @@ buildGoModule rec {
doInstallCheck = true;
versionCheckProgramArg = [ "-version" ];
versionCheckProgramArg = "-version";
meta = with lib; {
description = "Fast and multi-purpose DNS toolkit";

View file

@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
versionCheckProgram = "${placeholder "out"}/bin/dwarfs";
meta = {

View file

@ -4,11 +4,10 @@
rustPlatform,
fetchFromGitHub,
installShellFiles,
nix-update-script,
pkg-config,
bluez,
dbus,
libpulseaudio,
bluez,
}:
rustPlatform.buildRustPackage {
pname = "earbuds";
@ -30,25 +29,19 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-Y1pMmWxfXGcEFPj05/BpXQvd199O5l6hJmePNxMQc/Y=";
nativeBuildInputs = [
pkg-config
installShellFiles
pkg-config
];
buildInputs = [
bluez
dbus
libpulseaudio
bluez
];
# package does not contain any tests
doCheck = false;
# nativeInstallCheckInputs = [
# versionCheckHook
# ];
# versionCheckProgramArg = [ "--version" ];
# doInstallCheck = true;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd earbuds \
--bash <($out/bin/earbuds --generate bash) \

View file

@ -40,7 +40,7 @@ buildNpmPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = writeShellScript "update-elm-land" ''

View file

@ -45,13 +45,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.40.1";
version = "2.40.3";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
tag = finalAttrs.version;
hash = "sha256-k9t4qW8fPWc83/ys0Tyoief1HwELu9awIkclDBgDFW4=";
hash = "sha256-iGrUBhomnn5880lrjtLK7OEG7R2ZvpoM4fBauxUGECc=";
};
outputs = [

View file

@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };

View file

@ -25,7 +25,7 @@ buildGoModule rec {
versionCheckHook
];
versionCheckProgramArg = [ "version" ];
versionCheckProgramArg = "version";
doInstallCheck = true;
passthru = {

View file

@ -71,7 +71,7 @@ buildNpmPackage (finalAttrs: {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/filen";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
# Writes $HOME/Library/Application Support on darwin
doInstallCheck = !stdenv.hostPlatform.isDarwin;

View file

@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = {
description = "Concatenate a directory full of files into a single prompt for use with LLMs";

View file

@ -12,14 +12,14 @@
stdenv.mkDerivation rec {
pname = "find-billy";
version = "1.0.13";
version = "1.1.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "annaaurora";
repo = "Find-Billy";
rev = "v${version}";
hash = "sha256-VpQpAODasJpHLU1UQ3NoVnrO+tvwdMNpPDNkg/NDM+4=";
hash = "sha256-jKN3lEnLy0aN98S8BN3dcoOgc0RrxNoqfQdeCawKQaU=";
};
strictDeps = true;

View file

@ -331,7 +331,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
# Ensure that we don't vendor libpcre2, but instead link against the one from nixpkgs

View file

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.15.30";
version = "3.15.31";
pyproject = true;
src = fetchFromGitHub {
owner = "Flexget";
repo = "Flexget";
tag = "v${version}";
hash = "sha256-iGEGQxzvyyOeL/v0j1TiAjx2fa2tCZeRJ7VQByWpxJg=";
hash = "sha256-Q1o7jSFvwTD9qPXst6J9Vg/pY9olEPSUegBHOZueDEk=";
};
pythonRelaxDeps = true;

View file

@ -42,7 +42,7 @@ buildGoModule rec {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru = {
updateScript = nix-update-script { };

View file

@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/forge";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ftxui";
version = "5.0.0";
version = "6.0.2";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "ftxui";
rev = "v${version}";
sha256 = "sha256-IF6G4wwQDksjK8nJxxAnxuCw2z2qvggCmRJ2rbg00+E=";
tag = "v${version}";
hash = "sha256-VvP1ctFlkTDdrAGRERBxMRpFuM4mVpswR/HO9dzUSUo=";
};
strictDeps = true;
@ -34,19 +34,19 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DFTXUI_BUILD_EXAMPLES=OFF"
"-DFTXUI_BUILD_DOCS=ON"
"-DFTXUI_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
(lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false)
(lib.cmakeBool "FTXUI_BUILD_DOCS" true)
(lib.cmakeBool "FTXUI_BUILD_TESTS" doCheck)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
meta = with lib; {
meta = {
homepage = "https://github.com/ArthurSonzogni/FTXUI";
changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md";
description = "Functional Terminal User Interface library for C++";
license = licenses.mit;
license = lib.licenses.mit;
maintainers = [ ];
platforms = platforms.all;
platforms = lib.platforms.all;
};
}

View file

@ -8,41 +8,27 @@
python3.pkgs.buildPythonApplication rec {
pname = "gallia";
version = "1.9.0";
version = "2.0.0a4";
pyproject = true;
src = fetchFromGitHub {
owner = "Fraunhofer-AISEC";
repo = "gallia";
tag = "v${version}";
hash = "sha256-izMTTZrp4aizq5jS51BNtq3lv9Kr+xI7scZfYKXA/oY=";
hash = "sha256-by2zlfVN/FUNU9d5nn4JZ8xzto3k60DITPYhYqwm3Ms=";
};
pythonRelaxDeps = [
"aiofiles"
"httpx"
"msgspec"
];
build-system = with python3.pkgs; [ poetry-core ];
build-system = with python3.pkgs; [ hatchling ];
dependencies = with python3.pkgs; [
aiofiles
aiohttp
aiosqlite
argcomplete
python-can
exitcode
boltons
construct
httpx
more-itertools
msgspec
platformdirs
psutil
pydantic
pygit2
tabulate
tomli
zstandard
];

View file

@ -57,7 +57,7 @@ buildGoModule rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "version" ];
versionCheckProgramArg = "version";
doInstallCheck = false;
passthru.updateScript = nix-update-script { };

View file

@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
addBinToPathHook
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
# Numerical precision error

View file

@ -26,7 +26,7 @@ buildGoModule rec {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/geteduroam-cli";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru = {
tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {

View file

@ -95,7 +95,7 @@ buildGoModule rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -0,0 +1,24 @@
diff -ur a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml
--- a/gix-packetline/Cargo.toml
+++ b/gix-packetline/Cargo.toml
@@ -24,7 +24,7 @@
## If set, all IO will become blocking. The same types will be used preventing side-by-side usage of blocking and non-blocking IO.
blocking-io = []
## Implement IO traits from `futures-io`.
-async-io = ["dep:futures-io", "dep:futures-lite", "dep:pin-project-lite"]
+async-io = ["dep:futures-io", "futures-lite", "dep:pin-project-lite"]
#! ### Other
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
diff -ur a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml
--- a/gix-protocol/Cargo.toml
+++ b/gix-protocol/Cargo.toml
@@ -34,7 +34,7 @@
"gix-transport/async-client",
"dep:async-trait",
"dep:futures-io",
- "dep:futures-lite",
+ "futures-lite",
"handshake",
"fetch"
]

View file

@ -18,17 +18,21 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
version = "0.39.0";
version = "0.42.0";
src = fetchFromGitHub {
owner = "Byron";
owner = "GitoxideLabs";
repo = "gitoxide";
rev = "v${version}";
hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM=";
hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8=";
cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk=";
patches = [
./fix-cargo-dependencies.patch
];
nativeBuildInputs = [
cmake
@ -55,8 +59,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Command-line application for interacting with git repositories";
homepage = "https://github.com/Byron/gitoxide";
changelog = "https://github.com/Byron/gitoxide/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/GitoxideLabs/gitoxide";
changelog = "https://github.com/GitoxideLabs/gitoxide/blob/v${version}/CHANGELOG.md";
license = with licenses; [
mit # or
asl20

View file

@ -118,7 +118,7 @@ perlPackages.buildPerlPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -49,7 +49,7 @@ buildGoModule rec {
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/task";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };

View file

@ -26,7 +26,7 @@ buildGoModule rec {
];
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
meta = {

View file

@ -22,7 +22,7 @@ buildGoModule rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "-v" ];
versionCheckProgramArg = "-v";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -27,7 +27,7 @@ buildGoModule rec {
ldflags = [ "-s" ];
nativeCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec {
versionCheckHook
];
versionCheckProgram = [ "${placeholder "out"}/bin/golem-cli" ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -37,7 +37,7 @@ buildGoModule rec {
versionCheckHook
];
versionCheckProgramArg = [ "-v" ];
versionCheckProgramArg = "-v";
meta = {
description = "Go manage your Ollama models";

View file

@ -47,7 +47,7 @@ buildGoModule {
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -31,7 +31,7 @@ buildGoModule rec {
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
meta = with lib; {
description = "Tool for API and OWASP attack simulation";

View file

@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };

View file

@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -45,7 +45,7 @@ buildGoModule rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec {
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };

View file

@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec {
darwin.ps
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
pytestFlagsArray =
[

View file

@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-gja8bVsnumJ0R3sN1WBV6WXAWjO9v/K+uBpNO1cTgRs=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = nix-update-script { };

View file

@ -22,7 +22,7 @@ buildGoModule rec {
nativeInstallCheckHooks = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/hx";
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {

View file

@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
versionCheckProgramArg = "--version";
passthru.updateScript = nix-update-script { };

Some files were not shown because too many files have changed in this diff Show more