From c2ad2aa2446c2c47423c7c67d4b6cc06f49af2eb Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:20:29 -0300 Subject: [PATCH 01/57] pkgsMusl.jdk8: mark broken for musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tracking issue: https://github.com/NixOS/nixpkgs/issues/281618 error: ‘isnanf’ was not declared in this scope --- pkgs/development/compilers/openjdk/8.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index aebfceeccb78..d8d0d4ce1050 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -215,6 +215,10 @@ let maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; mainProgram = "java"; + # Broken for musl at 2024-01-17. Tracking issue: + # https://github.com/NixOS/nixpkgs/issues/281618 + # error: ‘isnanf’ was not declared in this scope + broken = stdenv.hostPlatform.isMusl; }; passthru = { From f199cf1c4eaafd411d9bec764645ff7ae433476c Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Wed, 27 Mar 2024 21:09:04 +0100 Subject: [PATCH 02/57] rocmPackages.composable_kernel: compress output to make it small enough for hydra --- .../rocm-modules/6/composable_kernel/default.nix | 6 +++++- .../rocm-modules/6/composable_kernel/unpack.nix | 16 ++++++++++++++++ pkgs/development/rocm-modules/6/default.nix | 10 ++++++---- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/rocm-modules/6/composable_kernel/unpack.nix diff --git a/pkgs/development/rocm-modules/6/composable_kernel/default.nix b/pkgs/development/rocm-modules/6/composable_kernel/default.nix index ac360482f4af..e0f8daf82638 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/default.nix @@ -9,6 +9,7 @@ , clang-tools-extra , git , gtest +, zstd , buildTests ? false , buildExamples ? false , gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { rocm-cmake clr clang-tools-extra + zstd ]; buildInputs = [ openmp ]; @@ -66,7 +68,9 @@ stdenv.mkDerivation (finalAttrs: { '' ; - postInstall = lib.optionalString buildTests '' + postInstall = '' + zstd --rm $out/lib/libdevice_operations.a + '' + lib.optionalString buildTests '' mkdir -p $test/bin mv $out/bin/test_* $test/bin '' + lib.optionalString buildExamples '' diff --git a/pkgs/development/rocm-modules/6/composable_kernel/unpack.nix b/pkgs/development/rocm-modules/6/composable_kernel/unpack.nix new file mode 100644 index 000000000000..2572884388fa --- /dev/null +++ b/pkgs/development/rocm-modules/6/composable_kernel/unpack.nix @@ -0,0 +1,16 @@ +{ runCommandLocal, + composable_kernel_build, + zstd +}: +let + ck = composable_kernel_build; +in runCommandLocal "unpack-${ck.name}" { + nativeBuildInputs = [ zstd ]; + meta = ck.meta; + } '' + mkdir -p $out + cp -r --no-preserve=mode ${ck}/* $out + zstd -dv --rm $out/lib/libdevice_operations.a.zst -o $out/lib/libdevice_operations.a + substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \ + --replace "${ck}" "$out" + '' diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index e4e745f74b56..a2c07ab66451 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -240,10 +240,12 @@ in rec { It is still available for some time as part of rocmPackages_5. ''; # Added 2024-3-3; - composable_kernel = callPackage ./composable_kernel { - inherit rocmUpdateScript rocm-cmake clr; - inherit (llvm) openmp clang-tools-extra; - stdenv = llvm.rocmClangStdenv; + composable_kernel = callPackage ./composable_kernel/unpack.nix { + composable_kernel_build = callPackage ./composable_kernel { + inherit rocmUpdateScript rocm-cmake clr; + inherit (llvm) openmp clang-tools-extra; + stdenv = llvm.rocmClangStdenv; + }; }; half = callPackage ./half { From 5c9bd5bf824a93d51774e6e0b7a9d796bcddb3ed Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 1 Jun 2024 14:09:05 +0000 Subject: [PATCH 03/57] moreutils: minor packaging improvements - use `perl.withPackages` instead of manually wrapping. - plumb the docbook via `DOCBOOKXSL` instead of patching. - specify `INSTALL_BIN=install` instead of upstream's default `install -s`. this lets the user control stripping (via stdenv's `dontStrip` option), and notably in a way which is compatible with cross compilation (`install -s` is not). --- pkgs/tools/misc/moreutils/default.nix | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 7d7dd80d7e7a..5d334cf0b855 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -22,23 +22,20 @@ stdenv.mkDerivation rec { hash = "sha256-hVvRAIXlG8+pAD2v/Ma9Z6EUL/1xIRz7Gx1fOxoQyi0="; }; - preBuild = '' - substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook - ''; - strictDeps = true; nativeBuildInputs = [ makeWrapper perl libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ]; - buildInputs = lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ + (perl.withPackages (p: [ p.IPCRun p.TimeDate p.TimeDuration ])) + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools + ]; - propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - - buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - installFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB - wrapProgram $out/bin/ts --prefix PERL5LIB : $PERL5LIB - ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "DOCBOOKXSL=${docbook-xsl}/xml/xsl/docbook" + "INSTALL_BIN=install" + "PREFIX=${placeholder "out"}" + ]; passthru.updateScript = gitUpdater { # No nicer place to find latest release. From 470ab4f97168ce279cc898870b61753aa9cebb40 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 2 Jun 2024 12:00:00 +0000 Subject: [PATCH 04/57] nixos/ibus: improve error message for non-engine packages when setting the option i18n.inputMethod.ibus.engines to a non-engine, like this: i18n.inputMethod.ibus.engines = [ pkgs.sl ]; the error message would be quite misleading: error: A definition for option `nodes.machine.i18n.inputMethod.ibus.engines."[definition 1-entry 1]"' is not of type `package'. Definition values: - In `makeTest parameters': sl is rejected and yet it *is* a package. This change improves the error message to this: error: A definition for option `nodes.machine.i18n.inputMethod.ibus.engines."[definition 1-entry 1]"' is not of type `ibus-engine'. Definition values: - In `makeTest parameters': --- nixos/modules/i18n/input-method/ibus.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index c82f0099253b..c44c86823599 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -5,8 +5,9 @@ with lib; let cfg = config.i18n.inputMethod.ibus; ibusPackage = pkgs.ibus-with-plugins.override { plugins = cfg.engines; }; - ibusEngine = types.package // { + ibusEngine = lib.types.mkOptionType { name = "ibus-engine"; + inherit (lib.types.package) descriptionClass merge; check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x); }; From d490a7e69ff3510431794cad0c0c177463b12f92 Mon Sep 17 00:00:00 2001 From: Zebreus Date: Sat, 1 Jun 2024 18:11:16 +0200 Subject: [PATCH 05/57] sturmflut: init at 0-unstable-2023-04-25 --- pkgs/by-name/st/sturmflut/package.nix | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/st/sturmflut/package.nix diff --git a/pkgs/by-name/st/sturmflut/package.nix b/pkgs/by-name/st/sturmflut/package.nix new file mode 100644 index 000000000000..ad5ee4fbefdc --- /dev/null +++ b/pkgs/by-name/st/sturmflut/package.nix @@ -0,0 +1,41 @@ +{ + stdenv, + lib, + pkg-config, + imagemagick, + fetchFromGitHub, + unstableGitUpdater, +}: + +stdenv.mkDerivation { + pname = "sturmflut"; + version = "0-unstable-2023-04-25"; + + src = fetchFromGitHub { + owner = "TobleMiner"; + repo = "sturmflut"; + rev = "0e3092ab6db23d2529b8ddc95e5d5e2c3ae8fc9d"; + hash = "sha256-amNkCDdfG1AqfQ5RCT4941uOtjQRSFt/opzE8yIaftc="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ imagemagick ]; + + installPhase = '' + runHook preInstall + install -m755 -D sturmflut $out/bin/sturmflut + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fast (80+ Gbit/s) pixelflut client with full IPv6 and animation support"; + homepage = "https://github.com/TobleMiner/sturmflut"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zebreus ]; + platforms = lib.platforms.linux; + mainProgram = "sturmflut"; + }; +} From 7f7ec524347b6478bcf07b60a191ed15ff0862ec Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Wed, 5 Jun 2024 22:39:10 +0200 Subject: [PATCH 06/57] nixos/tests/postgresql: add tls client cert test --- nixos/tests/all-tests.nix | 1 + nixos/tests/postgresql-tls-client-cert.nix | 141 +++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 nixos/tests/postgresql-tls-client-cert.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 98ba04119ea5..53b5ff754ec5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -754,6 +754,7 @@ in { postgresql = handleTest ./postgresql.nix {}; postgresql-jit = handleTest ./postgresql-jit.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; + postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {}; powerdns = handleTest ./powerdns.nix {}; powerdns-admin = handleTest ./powerdns-admin.nix {}; power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; diff --git a/nixos/tests/postgresql-tls-client-cert.nix b/nixos/tests/postgresql-tls-client-cert.nix new file mode 100644 index 000000000000..c1678ed733be --- /dev/null +++ b/nixos/tests/postgresql-tls-client-cert.nix @@ -0,0 +1,141 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +, package ? null +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; + +let + lib = pkgs.lib; + + # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. + makeTestAttribute = name: + { + inherit name; + value = makePostgresqlTlsClientCertTest pkgs."${name}"; + }; + + makePostgresqlTlsClientCertTest = pkg: + let + runWithOpenSSL = file: cmd: pkgs.runCommand file + { + buildInputs = [ pkgs.openssl ]; + } + cmd; + caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + caCert = runWithOpenSSL + "ca.crt" + '' + openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500 + ''; + serverKey = + runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + serverKeyPath = "/var/lib/postgresql"; + serverCert = + runWithOpenSSL "server.crt" '' + openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example" + openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \ + -CAcreateserial -out $out -days 36500 -sha256 + ''; + clientKey = + runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out"; + clientCert = + runWithOpenSSL "client.crt" '' + openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test" + openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \ + -CAcreateserial -out $out -days 36500 -sha256 + ''; + clientKeyPath = "/root"; + + in + makeTest { + name = "postgresql-tls-client-cert-${pkg.name}"; + meta.maintainers = with lib.maintainers; [ erictapen ]; + + nodes.server = { ... }: { + system.activationScripts = { + keyPlacement.text = '' + mkdir -p '${serverKeyPath}' + cp '${serverKey}' '${serverKeyPath}/server.key' + chown postgres:postgres '${serverKeyPath}/server.key' + chmod 600 '${serverKeyPath}/server.key' + ''; + }; + services.postgresql = { + package = pkg; + enable = true; + enableTCPIP = true; + ensureUsers = [ + { + name = "test"; + ensureDBOwnership = true; + } + ]; + ensureDatabases = [ "test" ]; + settings = { + ssl = "on"; + ssl_ca_file = toString caCert; + ssl_cert_file = toString serverCert; + ssl_key_file = "${serverKeyPath}/server.key"; + }; + authentication = '' + hostssl test test ::/0 cert clientcert=verify-full + ''; + }; + networking = { + interfaces.eth1 = { + ipv6.addresses = [ + { address = "fc00::1"; prefixLength = 120; } + ]; + }; + firewall.allowedTCPPorts = [ 5432 ]; + }; + }; + + nodes.client = { ... }: { + system.activationScripts = { + keyPlacement.text = '' + mkdir -p '${clientKeyPath}' + cp '${clientKey}' '${clientKeyPath}/client.key' + chown root:root '${clientKeyPath}/client.key' + chmod 600 '${clientKeyPath}/client.key' + ''; + }; + environment = { + variables = { + PGHOST = "db.test.example"; + PGPORT = "5432"; + PGDATABASE = "test"; + PGUSER = "test"; + PGSSLMODE = "verify-full"; + PGSSLCERT = clientCert; + PGSSLKEY = "${clientKeyPath}/client.key"; + PGSSLROOTCERT = caCert; + }; + systemPackages = [ pkg ]; + }; + networking = { + interfaces.eth1 = { + ipv6.addresses = [ + { address = "fc00::2"; prefixLength = 120; } + ]; + }; + hosts = { "fc00::1" = [ "db.test.example" ]; }; + }; + }; + + testScript = '' + server.wait_for_unit("multi-user.target") + client.wait_for_unit("multi-user.target") + client.succeed("psql -c \"SELECT 1;\"") + ''; + }; + +in +if package == null then +# all-tests.nix: Maps the generic function over all attributes of PostgreSQL packages + builtins.listToAttrs (map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))) +else +# Called directly from .tests + makePostgresqlTlsClientCertTest package From abce0bda0b84043dab90c8dd13cfb74c9d913493 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:09:13 -0300 Subject: [PATCH 07/57] maintainers/scripts/update.py: support skipping prompts --- maintainers/scripts/update.nix | 8 +++++++- maintainers/scripts/update.py | 8 +++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 3aff32caf581..821e032830d8 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -13,6 +13,7 @@ , include-overlays ? false , keep-going ? null , commit ? null +, skip-prompt ? null }: let @@ -184,6 +185,10 @@ let that support it by adding --argstr commit true + + to skip prompt: + + --argstr skip-prompt true ''; /* Transform a matched package into an object for update.py. @@ -204,7 +209,8 @@ let optionalArgs = lib.optional (max-workers != null) "--max-workers=${max-workers}" ++ lib.optional (keep-going == "true") "--keep-going" - ++ lib.optional (commit == "true") "--commit"; + ++ lib.optional (commit == "true") "--commit" + ++ lib.optional (skip-prompt == "true") "--skip-prompt"; args = [ packagesJson ] ++ optionalArgs; diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index bbed2bda5e03..2aebecd10b6a 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -207,7 +207,7 @@ async def start_updates(max_workers: int, keep_going: bool, commit: bool, packag eprint(e) sys.exit(1) -def main(max_workers: int, keep_going: bool, commit: bool, packages_path: str) -> None: +def main(max_workers: int, keep_going: bool, commit: bool, packages_path: str, skip_prompt: bool) -> None: with open(packages_path) as f: packages = json.load(f) @@ -217,7 +217,8 @@ def main(max_workers: int, keep_going: bool, commit: bool, packages_path: str) - eprint(f" - {package['name']}") eprint() - confirm = input('Press Enter key to continue...') + confirm = '' if skip_prompt else input('Press Enter key to continue...') + if confirm == '': eprint() eprint('Running update for:') @@ -236,12 +237,13 @@ parser.add_argument('--max-workers', '-j', dest='max_workers', type=int, help='N parser.add_argument('--keep-going', '-k', dest='keep_going', action='store_true', help='Do not stop after first failure') parser.add_argument('--commit', '-c', dest='commit', action='store_true', help='Commit the changes') parser.add_argument('packages', help='JSON file containing the list of package names and their update scripts') +parser.add_argument('--skip-prompt', '-s', dest='skip_prompt', action='store_true', help='Do not stop for prompts') if __name__ == '__main__': args = parser.parse_args() try: - main(args.max_workers, args.keep_going, args.commit, args.packages) + main(args.max_workers, args.keep_going, args.commit, args.packages, args.skip_prompt) except KeyboardInterrupt as e: # Let’s cancel outside of the main loop too. sys.exit(130) From 749aec844439cdc04602bbd1b4799c5c66554f32 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 23 Jun 2024 11:46:58 +0200 Subject: [PATCH 08/57] nixos/nspawn: cgroupsv2 by default That way you also get features like cgroup accounting for systemd units when using systemd-nspawn w/o classic nixos containers. --- nixos/modules/system/boot/systemd/nspawn.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/systemd/nspawn.nix b/nixos/modules/system/boot/systemd/nspawn.nix index 11fbb88838e1..e9bf82c462a9 100644 --- a/nixos/modules/system/boot/systemd/nspawn.nix +++ b/nixos/modules/system/boot/systemd/nspawn.nix @@ -127,6 +127,9 @@ in { }) { systemd.targets.multi-user.wants = [ "machines.target" ]; + systemd.services."systemd-nspawn@".environment = { + SYSTEMD_NSPAWN_UNIFIED_HIERARCHY = mkDefault "1"; + }; } ]; } From 06336ad012c897d2e787ca8f3dd63b48c265a44d Mon Sep 17 00:00:00 2001 From: wucke13 Date: Mon, 24 Jun 2024 23:04:19 +0200 Subject: [PATCH 09/57] urh: add wayland support --- pkgs/applications/radio/urh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 6363670d56b7..5b843f3a2583 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF ] + buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF qt5.qtwayland ] ++ lib.optional USRPSupport uhd; propagatedBuildInputs = with python3Packages; [ From f3851cb7814fd0429613f7640810b822bda4467d Mon Sep 17 00:00:00 2001 From: Maren van Otterdijk Date: Sun, 7 Jul 2024 17:06:40 +0200 Subject: [PATCH 10/57] swiProlog: 9.1.21 -> 9.2.5 --- pkgs/development/compilers/swi-prolog/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 305c77fbdb8f..c9cb3a9fdeb6 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -34,7 +34,8 @@ }: let - version = "9.1.21"; + # minorVersion is even for stable, odd for unstable + version = "9.2.5"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -43,11 +44,14 @@ stdenv.mkDerivation { pname = "swi-prolog"; inherit version; + # SWI-Prolog has two repositories: swipl and swipl-devel. + # - `swipl`, which tracks stable releases and backports + # - `swipl-devel` which tracks continuous development src = fetchFromGitHub { owner = "SWI-Prolog"; - repo = "swipl-devel"; + repo = "swipl"; rev = "V${version}"; - hash = "sha256-c4OSntnwIzo6lGhpyNVtNM4el5FGrn8kcz8WkDRfQhU="; + hash = "sha256-WbpYu6b0WPfKoAOkBZduWK20vwOYuDUDpJuj19qzPtw="; fetchSubmodules = true; }; From 6ec7cc37375f88066b82e4cd67d997c04eb92f13 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jul 2024 22:28:33 -0300 Subject: [PATCH 11/57] treewide: remove vrthra and lovek323 from meta.maintainers [no orphans] Tracking issue: https://github.com/NixOS/nixpkgs/issues/290642 Inactive since at least 2017 and 2022 respectively. --- pkgs/development/interpreters/guile/2.0.nix | 2 +- pkgs/development/interpreters/guile/2.2.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 18daad800568..57ff88025690 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -152,7 +152,7 @@ builder rec { processing. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ludo lovek323 vrthra ]; + maintainers = with maintainers; [ ludo ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 918735517ea3..9dd102012068 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -142,7 +142,7 @@ builder rec { foreign function call interface, and powerful string processing. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ludo lovek323 vrthra ]; + maintainers = with maintainers; [ ludo ]; platforms = platforms.all; }; } From 084dc9a4dfefe098524f0837900e734f93a7aa3e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jul 2024 22:29:06 -0300 Subject: [PATCH 12/57] treewide: remove vrthra from meta.maintainers [no orphans] Tracking issue: https://github.com/NixOS/nixpkgs/issues/290642 Inactive since at least 2017. --- pkgs/applications/editors/edit/default.nix | 2 +- pkgs/applications/misc/mdp/default.nix | 2 +- pkgs/applications/misc/mupdf/1.17/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- pkgs/applications/networking/browsers/netsurf/buildsystem.nix | 2 +- pkgs/applications/networking/mailreaders/neomutt/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/applications/terminal-emulators/xterm/default.nix | 2 +- pkgs/by-name/vi/vis/package.nix | 2 +- pkgs/data/fonts/unifont/default.nix | 2 +- pkgs/data/fonts/unifont_upper/default.nix | 2 +- pkgs/development/compilers/factor-lang/factor99.nix | 2 +- pkgs/development/compilers/mono/generic.nix | 2 +- pkgs/development/interpreters/icon-lang/default.nix | 2 +- pkgs/development/interpreters/io/default.nix | 1 - pkgs/development/interpreters/jimtcl/default.nix | 2 +- pkgs/development/interpreters/rakudo/default.nix | 2 +- pkgs/development/interpreters/rakudo/moarvm.nix | 2 +- pkgs/development/interpreters/rakudo/nqp.nix | 2 +- pkgs/development/interpreters/ruby/default.nix | 2 +- pkgs/development/libraries/gettext/default.nix | 2 +- pkgs/development/libraries/libmicrohttpd/generic.nix | 2 +- pkgs/development/python-modules/pypdf2/default.nix | 1 - pkgs/development/tools/misc/objconv/default.nix | 2 +- pkgs/development/tools/misc/tcptrack/default.nix | 2 +- pkgs/development/tools/misc/texinfo/common.nix | 2 +- pkgs/development/tools/misc/unifdef/default.nix | 2 +- pkgs/tools/misc/bdf2psf/default.nix | 2 +- pkgs/tools/misc/datamash/default.nix | 2 +- pkgs/tools/misc/parallel/default.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/tools/security/gnupg/22.nix | 2 +- pkgs/tools/security/gnupg/24.nix | 2 +- 33 files changed, 31 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index b1a0440bb004..c6e48e63c4a3 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { description = "Relaxing mix of Vi and ACME"; homepage = "https://c9x.me/edit"; license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; mainProgram = "edit"; }; diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 13d34b66801f..51fe1adfac2a 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/visit1985/mdp"; description = "Command-line based markdown presentation tool"; - maintainers = with maintainers; [ matthiasbeyer vrthra ]; + maintainers = with maintainers; [ matthiasbeyer ]; license = licenses.gpl3; platforms = with platforms; unix; mainProgram = "mdp"; diff --git a/pkgs/applications/misc/mupdf/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix index a3848ccc078b..932e23682f71 100644 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ b/pkgs/applications/misc/mupdf/1.17/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { homepage = "https://mupdf.com"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; knownVulnerabilities = [ "CVE-2020-26519: denial of service when parsing JBIG2" diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9422b6452cec..0f2ec9f39f23 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix index d08ffda76b49..489bf7cd7e02 100644 --- a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix +++ b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf browser shared build system"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ vrthra AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 8a26dbb315c7..d3c2fda9588f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "neomutt"; homepage = "https://www.neomutt.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ erikryb vrthra raitobezarius ]; + maintainers = with lib.maintainers; [ erikryb raitobezarius ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 43f0b97c9ff0..767897dbd04a 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ pstn vrthra ]; + maintainers = with maintainers; [ pstn ]; platforms = platforms.unix; changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}"; }; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 8fd39b2f6e7f..5650910cd8a6 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://invisible-island.net/xterm"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ nequissimus vrthra ]; + maintainers = with lib.maintainers; [ nequissimus ]; platforms = with lib.platforms; linux ++ darwin; changelog = "https://invisible-island.net/xterm/xterm.log.html"; }; diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix index 0ef1efaf7577..4872c53b841b 100644 --- a/pkgs/by-name/vi/vis/package.nix +++ b/pkgs/by-name/vi/vis/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "A vim like editor"; homepage = "https://github.com/martanne/vis"; license = licenses.isc; - maintainers = with maintainers; [ vrthra ramkromberg ]; + maintainers = with maintainers; [ ramkromberg ]; platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 0868abcdd58c..811b2b60b7cb 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # Basically GPL2+ with font exception. license = "https://unifoundry.com/LICENSE.txt"; - maintainers = [ maintainers.rycee maintainers.vrthra ]; + maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 058e4e4191c4..fbd1d4b53680 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { # Basically GPL2+ with font exception. license = "https://unifoundry.com/LICENSE.txt"; - maintainers = [ maintainers.mathnerd314 maintainers.vrthra ]; + maintainers = [ maintainers.mathnerd314 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/factor-lang/factor99.nix b/pkgs/development/compilers/factor-lang/factor99.nix index 168cf3ea3499..a020d6a2ce31 100644 --- a/pkgs/development/compilers/factor-lang/factor99.nix +++ b/pkgs/development/compilers/factor-lang/factor99.nix @@ -217,7 +217,7 @@ stdenv.mkDerivation { under a BSD license. ''; license = licenses.bsd2; - maintainers = with maintainers; [ vrthra spacefrogg ]; + maintainers = with maintainers; [ spacefrogg ]; platforms = lib.intersectLists platforms.x86_64 platforms.linux; mainProgram = "factor"; }; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index a3705de4ccb5..42c519e5021c 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; - maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; + maintainers = with maintainers; [ thoughtpolice obadz ]; license = with licenses; [ /* runtime, compilers, tools and most class libraries licensed */ mit /* runtime includes some code licensed */ bsd3 diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index e6afedb5b31c..e5c486ed8de2 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Very high level general-purpose programming language"; - maintainers = with maintainers; [ vrthra yurrriq ]; + maintainers = with maintainers; [ yurrriq ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos; license = licenses.publicDomain; homepage = "https://www.cs.arizona.edu/icon/"; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 64e5b7c4d827..0d522055d9ad 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ raskin maggesi - vrthra ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 4e9e9d1f87ae..2215fcaa06f3 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://jim.tcl.tk/"; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ dbohdan fgaz vrthra ]; + maintainers = with lib.maintainers; [ dbohdan fgaz ]; }; }) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 8ea91a46dd57..9381e8a15860 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; }; } diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 704d75b73bbc..a42c4a49705a 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; homepage = "https://moarvm.org"; license = licenses.artistic2; - maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; mainProgram = "moar"; platforms = platforms.unix; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index fafc53267dd8..9ceaba4446ad 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Raku/nqp"; license = licenses.artistic2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; }; } diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a9e5e5a04842..b7f765c213d4 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -267,7 +267,7 @@ let description = "Object-oriented language for quick and easy programming"; homepage = "https://www.ruby-lang.org/"; license = licenses.ruby; - maintainers = with maintainers; [ vrthra manveru ]; + maintainers = with maintainers; [ manveru ]; platforms = platforms.all; knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/."; }; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 7a0d7a3ee667..abb692aebc1e 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gettext/"; - maintainers = with maintainers; [ zimbatm vrthra ]; + maintainers = with maintainers; [ zimbatm ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 0af066c71238..58fadfdca507 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libmicrohttpd/"; - maintainers = with maintainers; [ eelco vrthra fpletz ]; + maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.unix; } // meta_; } diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index d40c07114504..d8bea0dbf51d 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -35,7 +35,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ desiderius - vrthra ]; }; } diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 9eee3cca1051..c811925fbe63 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mainProgram = "objconv"; homepage = "https://www.agner.org/optimize/"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej vrthra ]; + maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 5c1fe8c5b9b7..e638718474e5 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { mainProgram = "tcptrack"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor maintainers.vrthra ]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index f3f2e9389296..ab9da3cceafd 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ vrthra oxij ]; + maintainers = with maintainers; [ oxij ]; # see comment above in patches section broken = stdenv.hostPlatform.isPower64 && lib.strings.versionOlder version "6.0"; diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index ebb034a92e72..76c3b7346011 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ orivej vrthra ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 9bfc1f0beb0e..58a2739b264a 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Font converter to generate console fonts from BDF source fonts ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ rnhmjoj vrthra ]; + maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.all; mainProgram = "bdf2psf"; }; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index 6ee082c5151d..4836a28d9183 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/datamash/"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pSub vrthra ]; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 886b611b3464..03b9ad5935b8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pSub vrthra tomberek ]; + maintainers = with maintainers; [ pSub tomberek ]; mainProgram = "parallel"; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index f13cd8e07794..919b4dda863a 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { gpl3Plus /* tools */ ]; - maintainers = with maintainers; [ orivej vrthra ]; + maintainers = with maintainers; [ orivej ]; homepage = "https://www.gnu.org/software/mailutils/"; changelog = "https://git.savannah.gnu.org/cgit/mailutils.git/tree/NEWS"; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 475545526d37..38919532a556 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ fpletz vrthra ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; mainProgram = "gpg"; }; diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index 721c99dc4de9..b0ffe24a018f 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ fpletz vrthra ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; mainProgram = "gpg"; }; From 3cbea455e7cc9a3df6d466858fb48ae8b3a26a3f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jul 2024 22:25:51 -0300 Subject: [PATCH 13/57] tk: remove vrthra and lovek323 from meta.maintainers [all orphans] Tracking issue: https://github.com/NixOS/nixpkgs/issues/290642 Inactive since at least 2017 and 2022 respectively. --- pkgs/development/libraries/tk/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 540f5d5d7e36..2e2f41150296 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -69,6 +69,6 @@ tcl.mkTclDerivation { homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ lovek323 vrthra ]; + maintainers = with maintainers; [ ]; }; } From 9ffac6dc44d3901268329793290142cab5335b30 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jul 2024 22:23:25 -0300 Subject: [PATCH 14/57] treewide: remove vrthra from meta.maintainers [all orphans] Tracking issue: https://github.com/NixOS/nixpkgs/issues/290642 Inactive since 2017 --- pkgs/applications/editors/kakoune/default.nix | 2 +- pkgs/applications/editors/wily/default.nix | 2 +- pkgs/applications/graphics/zgv/default.nix | 2 +- pkgs/applications/misc/green-pdfviewer/default.nix | 2 +- pkgs/applications/misc/milu/default.nix | 2 +- pkgs/applications/misc/xsw/default.nix | 2 +- pkgs/applications/window-managers/tabbed/default.nix | 2 +- pkgs/by-name/sd/SDL_sixel/package.nix | 2 +- pkgs/development/interpreters/qnial/default.nix | 2 +- pkgs/development/interpreters/racket/default.nix | 2 +- pkgs/development/interpreters/racket/racket_7_9.nix | 2 +- pkgs/development/interpreters/unicon-lang/default.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/libgcrypt/default.nix | 2 +- pkgs/development/libraries/libgnurl/default.nix | 2 +- pkgs/development/libraries/libgpg-error/default.nix | 2 +- pkgs/development/libraries/libsixel/default.nix | 2 +- pkgs/development/libraries/wxsqlite3/default.nix | 2 +- pkgs/development/libraries/wxsqliteplus/default.nix | 2 +- pkgs/development/python-modules/aenum/default.nix | 2 +- pkgs/development/python-modules/agate-dbf/default.nix | 2 +- pkgs/development/python-modules/agate-excel/default.nix | 2 +- pkgs/development/python-modules/agate-sql/default.nix | 2 +- pkgs/development/python-modules/agate/default.nix | 2 +- pkgs/development/python-modules/dbf/default.nix | 2 +- pkgs/development/python-modules/dbfread/default.nix | 2 +- pkgs/development/python-modules/leather/default.nix | 2 +- pkgs/development/python-modules/python-slugify/default.nix | 2 +- pkgs/development/python-modules/pytimeparse/default.nix | 2 +- pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 2 +- pkgs/development/tools/build-managers/gnumake/default.nix | 2 +- pkgs/development/tools/build-managers/redo/default.nix | 2 +- pkgs/development/tools/misc/cflow/default.nix | 2 +- pkgs/development/tools/misc/cgdb/default.nix | 2 +- pkgs/development/tools/misc/cwebbin/default.nix | 2 +- pkgs/development/tools/misc/dejagnu/default.nix | 2 +- pkgs/development/tools/misc/ninka/default.nix | 2 +- pkgs/development/tools/misc/tie/default.nix | 2 +- pkgs/development/tools/textql/default.nix | 2 +- pkgs/development/tools/toluapp/default.nix | 2 +- pkgs/tools/archivers/pxattr/default.nix | 2 +- pkgs/tools/misc/dvtm/dvtm.nix | 2 +- pkgs/tools/misc/screen/default.nix | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 0e8ccb1d2d31..b30e1f59764e 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Vim inspired text editor"; license = licenses.publicDomain; mainProgram = "kak"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index 5c6eb5dc5ba3..a344f93bf241 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Emulation of ACME"; homepage = "http://wily.sourceforge.net"; license = licenses.artistic1; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "wily"; }; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 0b63f4673190..8df5e8262249 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "http://www.svgalib.org/rus/zgv/"; description = "Picture viewer with a thumbnail-based selector"; license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "zgv"; }; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 9f649b07ff8c..9c3c8c95872e 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { platforms = platforms.unix; license = licenses.gpl3; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "green"; }; } diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index b05a1c815baa..333d58d500c8 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { homepage = "https://github.com/yuejia/Milu"; license = lib.licenses.bsd2; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "milu"; }; } diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index 0e68a1769025..0baf0dc47a4e 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "xsw"; }; } diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 068d5c2f82ed..4bcc48eb4d8f 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://tools.suckless.org/tabbed"; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/sd/SDL_sixel/package.nix b/pkgs/by-name/sd/SDL_sixel/package.nix index e7fd400b5733..c4e383183bec 100644 --- a/pkgs/by-name/sd/SDL_sixel/package.nix +++ b/pkgs/by-name/sd/SDL_sixel/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { license = lib.licenses.lgpl21; mainProgram = "sdl-config"; maintainers = lib.teams.sdl.members - ++ (with lib.maintainers; [ vrthra ]); + ++ (with lib.maintainers; [ ]); platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index f5d7ef3c70fd..a23f1665e5cc 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { mainProgram = "nial"; homepage = "https://github.com/vrthra/qnial"; license = lib.licenses.artistic1; - maintainers = [ lib.maintainers.vrthra ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 314c760fa02c..e2dfabfa9781 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation rec { asl20 # or mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-darwin" "x86_64-linux" diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index 4db0db9385d0..49901e40f17d 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { asl20 # or mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-darwin" "x86_64-linux" diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 8dfa36e586b8..421958100cb0 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Very high level, goal-directed, object-oriented, general purpose applications language"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl2; homepage = "http://unicon.org"; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 44874246b6ea..3187b529aa17 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -87,7 +87,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; }; }; in self diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 41e420f173fb..ac8323ceb21e 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index e0de7acd38ba..011e86f06748 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.curl; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index a990546108cf..cf0c28930000 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -75,6 +75,6 @@ in stdenv.mkDerivation (rec { license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; }; } // genPosixLockObjOnlyAttrs) diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 5bdaafc9f15c..852f19da7877 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SIXEL library for console graphics, and converter programs"; homepage = "https://github.com/libsixel/libsixel"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index b968af23c0da..3a414166c77a 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://utelle.github.io/wxsqlite3/"; description = "C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; license = with licenses; [ lgpl3Plus gpl3Plus ]; }; } diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index aece1eb09cff..0775dca688b4 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mainProgram = "wxsqliteplus"; homepage = "https://github.com/guanlisheng/wxsqliteplus"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 3b25cf8bdf54..cc50b3b216d6 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; homepage = "https://github.com/ethanfurman/aenum"; license = licenses.bsd3; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 548ad6b5e40f..0f3008f16f23 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Adds read support for dbf files to agate"; homepage = "https://github.com/wireservice/agate-dbf"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index aad186601b7b..5615b4a9aa6c 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/wireservice/agate-excel"; changelog = "https://github.com/wireservice/agate-excel/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 7d357f49ff10..e5a723d2e262 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Adds SQL read/write support to agate"; homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 7af42df65a52..92b648ff0c69 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://github.com/wireservice/agate"; changelog = "https://github.com/wireservice/agate/blob/${version}/CHANGELOG.rst"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index ebe64fa28a50..760f5c8d5058 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Module for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; homepage = "https://github.com/ethanfurman/dbf"; license = licenses.bsd2; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 029ca35d7785..0f8b29bce110 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Read DBF Files with Python"; homepage = "https://dbfread.readthedocs.org/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 137fb2070f2c..bd844d647a62 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Python charting library"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index dcd0839cc097..8028d3fe860b 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/un33k/python-slugify"; changelog = "https://github.com/un33k/python-slugify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 44985f080a64..d31dcea151be 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/wroberts/pytimeparse"; changelog = "https://github.com/wroberts/pytimeparse/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 8e29846e91c7..ac22eee7e206 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/make/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "make"; platforms = platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 55b73888bc06..4f6bc99fbf01 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/make/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "make"; platforms = platforms.all; }; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 08910725104a..e6a68c4215c3 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://jdebp.eu./Softwares/redo/"; description = "System for building target files from source files"; license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.vrthra ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 9cdd8595a421..a1a116b46d07 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/cflow/"; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index b44c8e90f45e..1c3c1ba62232 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = with platforms; linux ++ cygwin; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index a5ed3e222aaa..d491b7199d38 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Literate Programming in C/C++"; platforms = with platforms; unix; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; license = licenses.abstyles; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 55581aedce60..57f8b2d84a7c 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index 9f0a618312bc..dcac08b08630 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -29,7 +29,7 @@ perlPackages.buildPerlPackage { mainProgram = "ninka"; homepage = "http://ninka.turingmachine.org/"; license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 2db093cf018a..eeaeca1f9c8a 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Allow multiple web change files"; mainProgram = "tie"; platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; license = licenses.abstyles; }; } diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 1523a30d18f8..820206503194 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -35,6 +35,6 @@ buildGoModule rec { mainProgram = "textql"; homepage = "https://github.com/dinedal/textql"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index bc5e1f280b96..ded720948ff0 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Tool to integrate C/Cpp code with Lua"; homepage = "http://www.codenix.com/~tolua/"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; mainProgram = "tolua++"; platforms = with platforms; unix; }; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index de4fc45b2611..a5a7ab40115c 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.lesbonscomptes.com/pxattr/index.html"; description = "Provides a single interface to extended file attributes"; - maintainers = [ lib.maintainers.vrthra ]; + maintainers = [ ]; license = [ lib.licenses.mit ]; platforms = lib.platforms.unix; mainProgram = "pxattr"; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index feb9c7a92f82..aedac2d61f98 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "Dynamic virtual terminal manager"; homepage = "http://www.brain-dump.org/projects/dvtm"; license = licenses.mit; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 40b79acba604..b79d0067480e 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ ]; }; } From 990e7c31a3e549fa0ac48355badb93e291c63f0f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 7 Jul 2024 12:13:25 -0300 Subject: [PATCH 15/57] treewide: remove cpages from meta.maintainers [all orphans] Tracking issue: https://github.com/NixOS/nixpkgs/issues/290642 Inactive since 2020 --- pkgs/development/libraries/rapidxml/default.nix | 2 +- pkgs/games/openxcom/default.nix | 2 +- pkgs/servers/amqp/qpid-cpp/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index 3a353b7a2bda..1b20f76eaa29 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://rapidxml.sourceforge.net/"; license = licenses.boost; platforms = platforms.unix; - maintainers = with maintainers; [ cpages ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 25b3bd8116b8..bfd22c3825eb 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { mainProgram = "openxcom"; homepage = "https://openxcom.org"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ cpages ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index c6cac7d7fa08..a8588663a8c1 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { description = "AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cpages ]; + maintainers = with maintainers; [ ]; }; } From 699ee6b3aafe67e4fef067107041fe2569b448f6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 7 Jul 2024 12:14:38 -0300 Subject: [PATCH 16/57] treewide: remove cpages from meta.maintainers [no orphans] Tracking issue: https://github.com/NixOS/nixpkgs/issues/290642 Inactive since 2020 --- pkgs/development/libraries/jsoncpp/default.nix | 2 +- pkgs/games/minecraft/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index ea530a955f75..f7b6d1c4baab 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "C++ library for interacting with JSON"; - maintainers = with maintainers; [ ttuegel cpages ]; + maintainers = with maintainers; [ ttuegel ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index b4a74fecd4f5..9bbe09367dd0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; - maintainers = with maintainers; [ cpages ryantm ]; + maintainers = with maintainers; [ ryantm ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; From 3e0881726479db21012b1c42e78b095dfc5b1b70 Mon Sep 17 00:00:00 2001 From: justanotherariel Date: Tue, 9 Jul 2024 00:31:40 +0200 Subject: [PATCH 17/57] goldwarden: 0.2.13 -> 0.3.3 --- pkgs/by-name/go/goldwarden/package.nix | 50 ++++++++++++-------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix index f9f862fe7cfb..264ea5268542 100644 --- a/pkgs/by-name/go/goldwarden/package.nix +++ b/pkgs/by-name/go/goldwarden/package.nix @@ -1,4 +1,5 @@ { lib +, blueprint-compiler , buildGoModule , fetchFromGitHub , fetchpatch @@ -13,46 +14,37 @@ buildGoModule rec { pname = "goldwarden"; - version = "0.2.13-unstable-2024-03-14"; + version = "0.3.3"; src = fetchFromGitHub { owner = "quexten"; repo = "goldwarden"; - rev = "d6e1cd263365611e520a2ef6c7847c9da19362f1"; - hash = "sha256-IItKOmE0xHKO2u5jp7R20/T2eSvQ3QCxlzp6R4oiqf8="; + rev = "v${version}"; + hash = "sha256-s00ZgRmp+0UTp4gpoQgZZqSJMRGsGuUxoX2DEryG+XM="; }; - patches = [ - (fetchpatch { - url = "https://github.com/quexten/goldwarden/pull/140/commits/c134a0e61d51079c44865f68ab65cfb3aea6f8f2.patch"; - hash = "sha256-nClC/FYq3muXMeYXln+VVGUhanqElEgJRosWeSTNlmM="; - }) - (fetchpatch { - url = "https://github.com/quexten/goldwarden/pull/140/commits/86d4f907fba241fd66d0fb3c109c0281a9766bb4.patch"; - hash = "sha256-A8PBzfyd2blFIjCeO4xOVJMQjnEPwtK4wTcRcfsjyDk="; - }) - ]; - postPatch = '' - substituteInPlace browserbiometrics/chrome-com.8bit.bitwarden.json browserbiometrics/mozilla-com.8bit.bitwarden.json \ - --replace-fail "@PATH@" "$out/bin/goldwarden" + substituteInPlace gui/src/{linux/main.py,linux/monitors/dbus_monitor.py,gui/settings.py} \ + --replace-fail "python3" "${(python3.buildEnv.override { extraLibs = pythonPath; }).interpreter}" substituteInPlace gui/com.quexten.Goldwarden.desktop \ --replace-fail "Exec=goldwarden_ui_main.py" "Exec=$out/bin/goldwarden-gui" - substituteInPlace gui/src/gui/browserbiometrics.py \ - --replace-fail "flatpak run --filesystem=home --command=goldwarden com.quexten.Goldwarden" "goldwarden" - substituteInPlace gui/src/gui/ssh.py \ + + substituteInPlace gui/src/gui/resources/commands.json \ + --replace-fail "flatpak run --filesystem=home --command=goldwarden com.quexten.Goldwarden" "goldwarden" \ --replace-fail "flatpak run --command=goldwarden com.quexten.Goldwarden" "goldwarden" \ --replace-fail 'SSH_AUTH_SOCK=/home/$USER/.var/app/com.quexten.Goldwarden/data/ssh-auth-sock' 'SSH_AUTH_SOCK=/home/$USER/.goldwarden-ssh-agent.sock' - substituteInPlace gui/src/{linux/main.py,linux/monitors/dbus_monitor.py,gui/settings.py} \ - --replace-fail "python3" "${(python3.buildEnv.override { extraLibs = pythonPath; }).interpreter}" + + substituteInPlace cli/browserbiometrics/chrome-com.8bit.bitwarden.json cli/browserbiometrics/mozilla-com.8bit.bitwarden.json \ + --replace-fail "@PATH@" "$out/bin/goldwarden" ''; - vendorHash = "sha256-IH0p7t1qInA9rNYv6ekxDN/BT5Kguhh4cZfmL+iqwVU="; + vendorHash = "sha256-TSmYqLMeS/G1rYNxVfh3uIK9bQJhsd7mos50yIXQoT4="; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ + blueprint-compiler gobject-introspection python3.pkgs.wrapPython wrapGAppsHook4 @@ -72,21 +64,23 @@ buildGoModule rec { ]; postInstall = '' + blueprint-compiler batch-compile gui/src/gui/.templates/ gui/src/gui/ gui/src/gui/*.blp chmod +x gui/goldwarden_ui_main.py - ln -s $out/share/goldwarden/goldwarden_ui_main.py $out/bin/goldwarden-gui + mkdir -p $out/share/goldwarden cp -r gui/* $out/share/goldwarden/ + ln -s $out/share/goldwarden/goldwarden_ui_main.py $out/bin/goldwarden-gui rm $out/share/goldwarden/{com.quexten.Goldwarden.desktop,com.quexten.Goldwarden.metainfo.xml,goldwarden.svg,python3-requirements.json,requirements.txt} install -D gui/com.quexten.Goldwarden.desktop -t $out/share/applications install -D gui/goldwarden.svg -t $out/share/icons/hicolor/scalable/apps install -Dm644 gui/com.quexten.Goldwarden.metainfo.xml -t $out/share/metainfo - install -Dm644 resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions + install -Dm644 cli/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions - install -D browserbiometrics/chrome-com.8bit.bitwarden.json $out/etc/chrome/native-messaging-hosts/com.8bit.bitwarden.json - install -D browserbiometrics/chrome-com.8bit.bitwarden.json $out/etc/chromium/native-messaging-hosts/com.8bit.bitwarden.json - install -D browserbiometrics/chrome-com.8bit.bitwarden.json $out/etc/edge/native-messaging-hosts/com.8bit.bitwarden.json - install -D browserbiometrics/mozilla-com.8bit.bitwarden.json $out/lib/mozilla/native-messaging-hosts/com.8bit.bitwarden.json + install -D cli/browserbiometrics/chrome-com.8bit.bitwarden.json $out/etc/chrome/native-messaging-hosts/com.8bit.bitwarden.json + install -D cli/browserbiometrics/chrome-com.8bit.bitwarden.json $out/etc/chromium/native-messaging-hosts/com.8bit.bitwarden.json + install -D cli/browserbiometrics/chrome-com.8bit.bitwarden.json $out/etc/edge/native-messaging-hosts/com.8bit.bitwarden.json + install -D cli/browserbiometrics/mozilla-com.8bit.bitwarden.json $out/lib/mozilla/native-messaging-hosts/com.8bit.bitwarden.json ''; dontWrapGApps = true; From 259d274a52f3ccdea80ca1be58439ba2a07d273c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 8 Jul 2024 19:13:30 +0200 Subject: [PATCH 18/57] doc: warn against zero-byte or missing shell completion files --- doc/hooks/installShellFiles.section.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index 834c6a37df15..9be67d57bfc6 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -4,7 +4,7 @@ This hook helps with installing manpages and shell completion files. It exposes The `installManPage` function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with `.gz` suffix). This function will place them into the correct `share/man/man
/` directory, in [`outputMan`](#outputman). -The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided. +The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). ```nix { @@ -17,6 +17,18 @@ The `installShellCompletion` function takes one or more paths to shell completio installShellCompletion --zsh --name _foobar share/completions.zsh # implicit behavior installShellCompletion share/completions/foobar.{bash,fish,zsh} + ''; +} +``` + +The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided (see below). + +If the destination shell completion file is not actually present or consists of zero bytes after calling `installShellCompletion` this is treated as a build failure. In particular, if completion files are not vendored but are generated by running an executable, this is likely to fail in cross compilation scenarios. The result will be a zero byte completion file and hence a build failure. To prevent this, guard the completion commands against this, e.g. + +```nix +{ + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' # using named fd installShellCompletion --cmd foobar \ --bash <($out/bin/foobar --bash-completion) \ From 9e622dcae1eb21026566240c20447cb3dfb9e0a8 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 9 Jul 2024 23:56:28 +0200 Subject: [PATCH 19/57] openconnect: enable Yubikey support --- pkgs/tools/networking/openconnect/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index fa54eecb89e1..42a8851d25aa 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -13,6 +13,7 @@ , libxml2 , stoken , zlib +, pcsclite , vpnc-scripts , PCSC , useDefaultExternalBrowser ? stdenv.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { "--without-openssl-version-check" ]; - buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] + buildInputs = [ gmp libxml2 stoken zlib pcsclite (if useOpenSSL then openssl else gnutls) ] ++ lib.optional stdenv.isDarwin PCSC ++ lib.optional stdenv.isLinux p11-kit ++ lib.optional useDefaultExternalBrowser xdg-utils; From 29577a69a157fb2bffce57c07e27f5e72d733ece Mon Sep 17 00:00:00 2001 From: Bintang Adiputra Pratama Date: Wed, 10 Jul 2024 12:59:35 +0700 Subject: [PATCH 20/57] ols: include `odinfmt` in derivation --- pkgs/by-name/ol/ols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index e4782d6b3bcf..d5830f962e0e 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; postPatch = '' - patchShebangs build.sh + patchShebangs build.sh odinfmt.sh ''; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild - ./build.sh + ./build.sh && ./odinfmt.sh runHook postBuild ''; @@ -37,7 +37,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -Dm755 ols -t $out/bin/ + install -Dm755 ols odinfmt -t $out/bin/ wrapProgram $out/bin/ols --set-default ODIN_ROOT ${odin}/share runHook postInstall From 06cbcd0501fbaf28a60dd00d15a66abbcbd5de05 Mon Sep 17 00:00:00 2001 From: Sam Schweigel Date: Wed, 10 Jul 2024 12:54:07 -0700 Subject: [PATCH 21/57] uftrace: add optional dependencies Build uftrace with all optional dependencies, save for libunwind (for debugging uftrace only). Link with Python and LuaJIT only in the "uftraceFull" version to keep the closure size down. --- pkgs/development/tools/uftrace/default.nix | 34 ++++++++++++++++++++-- pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index beb0a511aacf..8b8f9d80feb1 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -1,4 +1,17 @@ -{lib, stdenv, fetchFromGitHub}: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, pandoc +, capstone +, elfutils +, libtraceevent +, ncurses +, withLuaJIT ? false +, luajit +, withPython ? false +, python3 +}: stdenv.mkDerivation rec { pname = "uftrace"; @@ -11,8 +24,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-JuBwyE6JH3CpJH863LbnWELUIIEKVaAcz8h8beeABGQ="; }; + nativeBuildInputs = [ pkg-config pandoc ]; + buildInputs = + [ capstone elfutils libtraceevent ncurses ] + ++ lib.optional withLuaJIT luajit + ++ lib.optional withPython python3; + + # libmcount.so dlopens python and luajit, make sure they're in the RUNPATH + preBuild = + let + libs = lib.optional withLuaJIT "luajit" ++ lib.optional withPython "python3-embed"; + in + lib.optionalString (withLuaJIT || withPython) '' + makeFlagsArray+=(LDFLAGS_lib="$(pkg-config --libs ${lib.concatStringsSep " " libs})") + ''; + postUnpack = '' - patchShebangs . + patchShebangs . ''; meta = { @@ -21,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/namhyung/uftrace"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [lib.maintainers.nthorne]; + maintainers = [ lib.maintainers.nthorne ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cfa6a4f74f3..7291546d0def 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13786,6 +13786,11 @@ with pkgs; uftrace = callPackage ../development/tools/uftrace { }; + uftraceFull = uftrace.override { + withLuaJIT = true; + withPython = true; + }; + uftpd = callPackage ../servers/ftp/uftpd {}; uget = callPackage ../tools/networking/uget { }; From 16d84c9dc9ec73c32332a3313b96412808be62d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Jul 2024 23:38:12 +0200 Subject: [PATCH 22/57] python312Packages.zha: 0.0.15 -> 0.0.19 Changelog: https://github.com/zigpy/zha/releases/tag/0.0.19 --- pkgs/development/python-modules/zha/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 87d5d230d7a0..03e1e01eb609 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.15"; + version = "0.0.19"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,12 +36,12 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-k4Wqxv7WJGDDGXA80qW+RUICTUcgLsWJNiV+zsOkfuM="; + hash = "sha256-12VxNj2XVfp1x0czwTZL05RaViQQdAQu7r4i0vGgUUU="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail '"setuptools-git-versioning<3"' "" \ --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; @@ -117,7 +117,7 @@ buildPythonPackage rec { description = "Zigbee Home Automation"; homepage = "https://github.com/zigpy/zha"; changelog = "https://github.com/zigpy/zha/releases/tag/${version}"; - license = licenses.gpl3Only; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From d8f6f61293409193613c0fbad23462c6f84233e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Jul 2024 23:39:18 +0200 Subject: [PATCH 23/57] python312Packages.zha: 0.0.19 -> 0.0.20 Diff: https://github.com/zigpy/zha/compare/refs/tags/0.0.19...0.0.20 Changelog: https://github.com/zigpy/zha/releases/tag/0.0.20 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 03e1e01eb609..3187d8f19f0b 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.19"; + version = "0.0.20"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-12VxNj2XVfp1x0czwTZL05RaViQQdAQu7r4i0vGgUUU="; + hash = "sha256-kmTOWHREdzXfgDPPs91GfQCgpmkUshwGtscOTT1WGns="; }; postPatch = '' From 1309e2ecf976aded9f5ad5023109338b003a4d84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Jul 2024 13:23:01 +0200 Subject: [PATCH 24/57] metasploit: 6.4.16 -> 6.4.17 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 13 +++++++------ pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 10 +++++----- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index e96d4350d251..7769a59878a7 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.16" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.17" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 548118f22da0..1edbe11c5dc2 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: d21ca8b456e74278a0149a34ced9292692b5c52d - ref: refs/tags/6.4.16 + revision: edac4a2e9e1ccf33e8b065fb64c289adf43f7a8b + ref: refs/tags/6.4.17 specs: - metasploit-framework (6.4.16) + metasploit-framework (6.4.17) aarch64 abbrev actionpack (~> 7.0.0) @@ -31,6 +31,7 @@ GIT faraday (= 2.7.11) faraday-retry faye-websocket + ffi (= 1.16.3) filesize getoptlong hrr_rb_ssh-ed25519 @@ -44,7 +45,7 @@ GIT metasploit-model metasploit-payloads (= 2.0.166) metasploit_data_models - metasploit_payloads-mettle (= 1.0.28) + metasploit_payloads-mettle (= 1.0.29) mqtt msgpack (~> 1.6.0) mutex_m @@ -281,7 +282,7 @@ GEM railties (~> 7.0) recog webrick - metasploit_payloads-mettle (1.0.28) + metasploit_payloads-mettle (1.0.29) method_source (1.1.0) mini_portile2 (2.8.6) minitest (5.23.1) @@ -484,4 +485,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.5.11 + 2.5.9 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f73cfe86b63a..aa55a677e7ce 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.16"; + version = "6.4.17"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-dCeSSxIIDMsEa6hQ43tcoRDMLkE3o+UzwsGOWE7jUPA="; + hash = "sha256-OpEG6HICBFOyCH6Bfz5OfH3YjKtLRPyFlgRI29lmuDo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index c1b2f3484aa7..2712dc704e74 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "d21ca8b456e74278a0149a34ced9292692b5c52d"; - sha256 = "1w2hwd75i3n1q8ryb8rp84pcq451bixy6l58dc2cn308295r49vl"; + rev = "edac4a2e9e1ccf33e8b065fb64c289adf43f7a8b"; + sha256 = "0fmqcvcxnj04js2zqi2bmf6dhzbw9qz7z0by12r56102fbl0d49s"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.16"; + version = "6.4.17"; }; metasploit-model = { groups = ["default"]; @@ -766,10 +766,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0649y1zc2pncfalsa5nkszmbiz1gfg4q3bhh4p2q6vwaac5g6sfj"; + sha256 = "0677lldp420sbq876j3qm7p8rp7hm1y9fdxgmsw0xdj97010ahbj"; type = "gem"; }; - version = "1.0.28"; + version = "1.0.29"; }; method_source = { groups = ["default"]; From 7f30c01c6584502330cec146f91b3246dcabce8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 01:09:55 +0000 Subject: [PATCH 25/57] cpuinfo: 0-unstable-2024-06-02 -> 0-unstable-2024-07-10 --- pkgs/by-name/cp/cpuinfo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 19d90c11191c..00a7f2c2f995 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2024-06-02"; + version = "0-unstable-2024-07-10"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "05332fd802d9109a2a151ec32154b107c1e5caf9"; - hash = "sha256-VhTRHpT+4g97m+amOZ52lJWavHsN5QVnjnEn6wJzE3A="; + rev = "ca678952a9a8eaa6de112d154e8e104b22f9ab3f"; + hash = "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From 486d8c4a351415e848c181726cb8ed91d26d3345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 12 Jul 2024 02:51:06 +0200 Subject: [PATCH 26/57] prometheus-node-exporter: move to by-name This change was primarly made to get rid of the inherit (darwin... hack, to make vendoring old versions of the exporter easier Co-authored-by: nicoo --- .../pr/prometheus-node-exporter/package.nix} | 7 ++----- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) rename pkgs/{servers/monitoring/prometheus/node-exporter.nix => by-name/pr/prometheus-node-exporter/package.nix} (87%) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix similarity index 87% rename from pkgs/servers/monitoring/prometheus/node-exporter.nix rename to pkgs/by-name/pr/prometheus-node-exporter/package.nix index d3b7c6786f84..eac863a9962a 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -1,7 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests - # darwin - , CoreFoundation, IOKit -}: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests, darwin }: buildGoModule rec { pname = "node_exporter"; @@ -20,7 +17,7 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation IOKit ]); excludedPackages = [ "docs/node-mixin" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 722792b76cc6..15ab5483d37e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26135,9 +26135,6 @@ with pkgs; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; - prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; - }; prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; prometheus-pgbouncer-exporter = callPackage ../servers/monitoring/prometheus/pgbouncer-exporter.nix { }; From d0ddc65657b4dfded88425f54d46e43dce7d0bc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 01:39:54 +0000 Subject: [PATCH 27/57] python312Packages.xkbcommon: 1.0 -> 1.5.1 --- pkgs/development/python-modules/xkbcommon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index a7db6ea5fe52..5d5ce9430959 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xkbcommon"; - version = "1.0"; + version = "1.5.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NTEafcAU/PU1/2n3pb3m8dbZptI9j9nnmVG4iFqHHe8="; + hash = "sha256-rBdICNv2HTXZ2oBL8zuqx0vG8r4MEIWUrpPHnNFd3DY="; }; nativeBuildInputs = [ pkg-config ]; From 267e9b0fa393965ddede47b12bfda625770f2713 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 02:02:46 +0000 Subject: [PATCH 28/57] python312Packages.pudb: 2024.1 -> 2024.1.1 --- pkgs/development/python-modules/pudb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index cfafbc0fb7a6..44ca0a695068 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2024.1"; + version = "2024.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/J1ql2pZtZB2TIN57CAP7NR/qoQlm2Tv2M2GBmoK8zg="; + hash = "sha256-/19TleNqGaZfIvUi/WAn0no2q3g95FEbQckUhKthSXU="; }; propagatedBuildInputs = [ From 7dd53c5e66979d1ca16333c8f987c5b3c19e094b Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:08:55 -0400 Subject: [PATCH 29/57] maturin: migrate to by-name --- .../maturin/default.nix => by-name/ma/maturin/package.nix} | 4 ++-- .../tools/rust => by-name/ma}/maturin/pyo3-test/Cargo.lock | 0 .../tools/rust => by-name/ma}/maturin/pyo3-test/default.nix | 0 .../tools/rust => by-name/ma}/maturin/pyo3-test/generic.nix | 0 pkgs/top-level/all-packages.nix | 3 --- 5 files changed, 2 insertions(+), 5 deletions(-) rename pkgs/{development/tools/rust/maturin/default.nix => by-name/ma/maturin/package.nix} (91%) rename pkgs/{development/tools/rust => by-name/ma}/maturin/pyo3-test/Cargo.lock (100%) rename pkgs/{development/tools/rust => by-name/ma}/maturin/pyo3-test/default.nix (100%) rename pkgs/{development/tools/rust => by-name/ma}/maturin/pyo3-test/generic.nix (100%) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/by-name/ma/maturin/package.nix similarity index 91% rename from pkgs/development/tools/rust/maturin/default.nix rename to pkgs/by-name/ma/maturin/package.nix index 266cd54fdfd2..ae91734bdeb9 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -3,8 +3,8 @@ , stdenv , fetchFromGitHub , rustPlatform +, darwin , libiconv -, Security }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0="; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; # Requires network access, fails in sandbox. doCheck = false; diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock similarity index 100% rename from pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock rename to pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix similarity index 100% rename from pkgs/development/tools/rust/maturin/pyo3-test/default.nix rename to pkgs/by-name/ma/maturin/pyo3-test/default.nix diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix similarity index 100% rename from pkgs/development/tools/rust/maturin/pyo3-test/generic.nix rename to pkgs/by-name/ma/maturin/pyo3-test/generic.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 046a6cb88624..d9117eaa8c12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16560,9 +16560,6 @@ with pkgs; leptosfmt = callPackage ../development/tools/rust/leptosfmt { }; - maturin = callPackage ../development/tools/rust/maturin { - inherit (darwin.apple_sdk.frameworks) Security; - }; panamax = callPackage ../development/tools/rust/panamax { }; ograc = callPackage ../development/tools/rust/ograc { }; From 929a0f4bd1e7d5fc4ebd2bdc7f9759b6997222c8 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:09:27 -0400 Subject: [PATCH 30/57] maturin: format with nixfmt --- pkgs/by-name/ma/maturin/package.nix | 27 +++++++++++------- pkgs/by-name/ma/maturin/pyo3-test/default.nix | 4 +-- pkgs/by-name/ma/maturin/pyo3-test/generic.nix | 28 +++++++++++-------- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index ae91734bdeb9..8869cee2050f 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -1,10 +1,11 @@ -{ callPackage -, lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -, libiconv +{ + callPackage, + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + libiconv, }: rustPlatform.buildRustPackage rec { @@ -20,12 +21,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + libiconv + ]; # Requires network access, fails in sandbox. doCheck = false; - passthru.tests.pyo3 = callPackage ./pyo3-test {}; + passthru.tests.pyo3 = callPackage ./pyo3-test { }; meta = with lib; { description = "Build and publish Rust crates Python packages"; @@ -40,7 +44,10 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/PyO3/maturin"; changelog = "https://github.com/PyO3/maturin/blob/v${version}/Changelog.md"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ma/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix index 7f79c8565d23..140d7154c6b6 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/default.nix +++ b/pkgs/by-name/ma/maturin/pyo3-test/default.nix @@ -1,6 +1,4 @@ -{ python3 -, rustPlatform -}: +{ python3, rustPlatform }: python3.pkgs.callPackage ./generic.nix { buildAndTestSubdir = "examples/word-count"; diff --git a/pkgs/by-name/ma/maturin/pyo3-test/generic.nix b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix index 7bc7e8d43bcb..f32d616e361e 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/generic.nix +++ b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix @@ -1,16 +1,17 @@ # Derivation prototype, used by maturin and setuptools-rust # passthrough tests. -{ lib -, fetchFromGitHub -, python -, rustPlatform +{ + lib, + fetchFromGitHub, + python, + rustPlatform, -, nativeBuildInputs + nativeBuildInputs, -, buildAndTestSubdir ? null -, format ? "pyproject" -, preConfigure ? "" + buildAndTestSubdir ? null, + format ? "pyproject", + preConfigure ? "", }: python.pkgs.buildPythonPackage rec { @@ -24,15 +25,18 @@ python.pkgs.buildPythonPackage rec { hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; postPatch = '' ln -s ${./Cargo.lock} Cargo.lock ''; - inherit buildAndTestSubdir format nativeBuildInputs preConfigure; + inherit + buildAndTestSubdir + format + nativeBuildInputs + preConfigure + ; pythonImportsCheck = [ "word_count" ]; From 4cb00793c70daf95845e2b363402d9bbccecca20 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:09:42 -0400 Subject: [PATCH 31/57] maturin: adopt --- pkgs/by-name/ma/maturin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 8869cee2050f..725cc84ac4e3 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec { asl20 # or mit ]; - maintainers = [ ]; + maintainers = with maintainers; [ getchoo ]; }; } From 10516a7c63d41b4c1c3f77f9c9fee458bc79a524 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:11:41 -0400 Subject: [PATCH 32/57] maturin: don't overuse `with lib` https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/ma/maturin/package.nix | 8 ++++---- pkgs/by-name/ma/maturin/pyo3-test/generic.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 725cc84ac4e3..029e6efb8bca 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -31,9 +31,8 @@ rustPlatform.buildRustPackage rec { passthru.tests.pyo3 = callPackage ./pyo3-test { }; - meta = with lib; { + meta = { description = "Build and publish Rust crates Python packages"; - mainProgram = "maturin"; longDescription = '' Build and publish Rust crates with PyO3, rust-cpython, and cffi bindings as well as Rust binaries as Python packages. @@ -44,10 +43,11 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/PyO3/maturin"; changelog = "https://github.com/PyO3/maturin/blob/v${version}/Changelog.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ getchoo ]; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "maturin"; }; } diff --git a/pkgs/by-name/ma/maturin/pyo3-test/generic.nix b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix index f32d616e361e..aed3e8a00770 100644 --- a/pkgs/by-name/ma/maturin/pyo3-test/generic.nix +++ b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix @@ -40,10 +40,10 @@ python.pkgs.buildPythonPackage rec { pythonImportsCheck = [ "word_count" ]; - meta = with lib; { + meta = { description = "PyO3 word count example"; homepage = "https://github.com/PyO3/pyo3"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; } From 5bf72c97bcf0f76cab8d666cb13c0b4098130cd7 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:13:03 -0400 Subject: [PATCH 33/57] maturin: add version test --- pkgs/by-name/ma/maturin/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 029e6efb8bca..b80bfa29f4c6 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -6,6 +6,8 @@ rustPlatform, darwin, libiconv, + testers, + maturin, }: rustPlatform.buildRustPackage rec { @@ -29,7 +31,12 @@ rustPlatform.buildRustPackage rec { # Requires network access, fails in sandbox. doCheck = false; - passthru.tests.pyo3 = callPackage ./pyo3-test { }; + passthru = { + tests = { + version = testers.testVersion { package = maturin; }; + pyo3 = callPackage ./pyo3-test { }; + }; + }; meta = { description = "Build and publish Rust crates Python packages"; From c64a719620b28462a7b6ae9b537f7d6c0aac4843 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:14:16 -0400 Subject: [PATCH 34/57] maturin: add updateScript --- pkgs/by-name/ma/maturin/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index b80bfa29f4c6..64f5639dc851 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -7,6 +7,7 @@ darwin, libiconv, testers, + nix-update-script, maturin, }: @@ -36,6 +37,8 @@ rustPlatform.buildRustPackage rec { version = testers.testVersion { package = maturin; }; pyo3 = callPackage ./pyo3-test { }; }; + + updateScript = nix-update-script { }; }; meta = { From a0292e41785dbc7f9f3805fb18378b78fb6ebe4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 04:44:59 +0000 Subject: [PATCH 35/57] python312Packages.dbt-adapters: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/dbt-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index ad2616490319..04e52796cf80 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-Erx/j1x+I4ypPqBFzJRZk3ILr3ZG97Hvk4vXe2p6cDc="; + hash = "sha256-M7n+WcHGBMNZ5k9GZRR05g8KzPDWjmB83iZSD16G774="; }; build-system = [ hatchling ]; From 3b880f5d39c2c78e9d96bd3178c9c241f59cc807 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 05:18:33 +0000 Subject: [PATCH 36/57] python312Packages.netutils: 1.8.1 -> 1.9.0 --- pkgs/development/python-modules/netutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index e86e0c625573..ef207caab053 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-09SRSzA1RiBhJjq+dlln23myWvXFhr8krsPz7N80JKw="; + hash = "sha256-JPGdxkrbDGdehBviXl851J5da10auu8TDQDBnQzK2uk="; }; build-system = [ poetry-core ]; From 0e083a337b386b67fb75a108f6c55d6fffd0e2dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 05:23:02 +0000 Subject: [PATCH 37/57] python312Packages.geoalchemy2: 0.15.1 -> 0.15.2 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 35969322e75e..bd3cd71bfa47 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.15.1"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-EMsaB6VDDDvXg9LKa9ms0+AfzX1rG+yeR898EK59DDs="; + hash = "sha256-c5PvkQdfKajQha2nAtqYq7aHCgP/n41ekE04Rl2Pnr0="; }; build-system = [ From 146d8a7c68ddd126911d12715e6b3ec17aa936f7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jul 2024 07:54:33 +0200 Subject: [PATCH 38/57] python311Packages.numpyro: 0.15.0 -> 0.15.1 Changelog: https://github.com/pyro-ppl/numpyro/releases/tag/0.15.1 --- pkgs/development/python-modules/numpyro/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index b26e61b945ce..620152dcbfa7 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-4WyfR8wx4qollYSgtslEMSCB0zypJAYCJjKtWEsOYA0="; + hash = "sha256-HnX6sYRdEpbCMDXHsk1l/h60630ZwmED3SUioLA3wrU="; }; build-system = [ setuptools ]; @@ -69,11 +69,11 @@ buildPythonPackage rec { # TODO: remove when tensorflow-probability gets fixed. disabledTestPaths = [ "test/test_distributions.py" ]; - meta = with lib; { + meta = { description = "Library for probabilistic programming with NumPy"; homepage = "https://num.pyro.ai/"; changelog = "https://github.com/pyro-ppl/numpyro/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } From dd99a18bb975b42f470340c5b57ed071b45e72ca Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jul 2024 08:08:26 +0200 Subject: [PATCH 39/57] python311Packages.devito: 4.8.9 -> 4.8.10 Diff: https://github.com/devitocodes/devito/compare/refs/tags/v4.8.9...v4.8.10 Changelog: https://github.com/devitocodes/devito/releases/tag/v4.8.10 --- pkgs/development/python-modules/devito/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 10f33e1155d3..492998653c3e 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.9"; + version = "4.8.10"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-uCZBCq1Lzc2IwjvqAY+wZzyEOeYraegt0242aI5CPUI="; + hash = "sha256-r3HsVZo+2WnjxIToGTOR/xp1l4G2a3+sHslBA8iEdSo="; }; pythonRemoveDeps = [ @@ -46,7 +46,6 @@ buildPythonPackage rec { pythonRelaxDeps = true; - dependencies = [ anytree cached-property From 563a6f804fbc2367683803b55f8a8063e24c8299 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 12 Jul 2024 06:58:39 +0200 Subject: [PATCH 40/57] =?UTF-8?q?ocamlPackages.zarith:=201.13=20=E2=86=92?= =?UTF-8?q?=201.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/zarith/default.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index b260d946ce1e..c09b5a828f92 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,20 +1,24 @@ { lib, stdenv, fetchFromGitHub , ocaml, findlib, pkg-config , gmp +, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.14" else "1.13" }: if lib.versionOlder ocaml.version "4.04" then throw "zarith is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ocaml${ocaml.version}-zarith"; - version = "1.13"; + inherit version; src = fetchFromGitHub { owner = "ocaml"; repo = "Zarith"; rev = "release-${version}"; - sha256 = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; + hash = { + "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; + "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE="; + }."${finalAttrs.version}"; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; @@ -31,9 +35,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, arbitrary precision OCaml integers"; homepage = "https://github.com/ocaml/Zarith"; - changelog = "https://github.com/ocaml/Zarith/raw/${src.rev}/Changes"; + changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes"; license = licenses.lgpl2; inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 046a6cb88624..3b7c468e3cfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9529,7 +9529,9 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14.overrideScope (self: super: { + zarith = super.zarith.override { version = "1.13"; }; + }); in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; From 2a198b20f00cdb26e67b9de6d74fdfb0aebacb3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 08:40:30 +0000 Subject: [PATCH 41/57] checkSSLCert: 2.81.1 -> 2.82.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index c3098a8a8e27..86098d640223 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.81.1"; + version = "2.82.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-ZF1izxIgpoQrWWI+G5vuAJsbc/IwUlAZHhUIHKCY2DA="; + hash = "sha256-u+/IXevDt4mlnQ4a1M1t2Zh26/FBd9yAtpr71NrdXTY="; }; nativeBuildInputs = [ From a7bda90b0ed0d5f81f219f98645ee4549f583952 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Jul 2024 17:34:01 +0200 Subject: [PATCH 42/57] open-webui: 0.3.7 -> 0.3.8 diff: https://github.com/open-webui/open-webui/compare/v0.3.7..v0.3.8 changelog: https://github.com/open-webui/open-webui/releases/tag/v0.3.8 --- pkgs/by-name/op/open-webui/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index bffa3c7d3e1c..22de3691cbd3 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-tsJILQ+CuVy8LYSixYNJAwSIZtRegrXXvGzvyf7Knd0="; + hash = "sha256-kUdy8zSt8RvGlMKa0gxp0tnZbo7/igDeFV2zsel5LXA="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-fB5gvC2sLfH2dJJi+CYyF7PRg+GhZDavhKgeRStaR7I="; + npmDepsHash = "sha256-sjQJn94GmSdOY1B2bmFTsxjLrc7LSBgDpWNrXIHunsg="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -63,6 +63,7 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ aiohttp + alembic anthropic apscheduler argon2-cffi From d6e14ec84e70cd49e30038e5163d330ea5bdee35 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Jul 2024 23:41:59 +0200 Subject: [PATCH 43/57] python3Packages.ctranslate2: disable TensorFlow tests --- .../python-modules/ctranslate2/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix index 976944c33780..da76a4d63dbe 100644 --- a/pkgs/development/python-modules/ctranslate2/default.nix +++ b/pkgs/development/python-modules/ctranslate2/default.nix @@ -13,7 +13,6 @@ # tests pytestCheckHook, - tensorflow-bin, torch, transformers, wurlitzer, @@ -48,7 +47,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - tensorflow-bin torch transformers wurlitzer @@ -64,6 +62,16 @@ buildPythonPackage rec { disabledTests = [ # AssertionError: assert 'int8' in {'float32'} "test_get_supported_compute_types" + # Tensorflow (tf) not available in Python 3.12 yet + # To remove when https://github.com/NixOS/nixpkgs/pull/325224 is fixed + "test_opennmt_tf_model_conversion" + "test_opennmt_tf_model_quantization" + "test_opennmt_tf_model_conversion_invalid_vocab" + "test_opennmt_tf_model_conversion_invalid_dir" + "test_opennmt_tf_shared_embeddings_conversion" + "test_opennmt_tf_postnorm_transformer_conversion" + "test_opennmt_tf_gpt_conversion" + "test_opennmt_tf_multi_features" ]; disabledTestPaths = [ From 076063ab15f9bd5269beac5d7294610a8354cca2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 12 Jul 2024 10:53:02 +0200 Subject: [PATCH 44/57] python3Packages.langchain-community: disable tests requiring `duckdb-engine` --- .../python-modules/langchain-community/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 4bf2cd9bd0f9..c291bd41d78d 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -6,7 +6,6 @@ pythonOlder, aiohttp, dataclasses-json, - duckdb-engine, langchain, langchain-core, langsmith, @@ -65,7 +64,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_community" ]; nativeCheckInputs = [ - duckdb-engine lark pandas pytest-asyncio @@ -88,6 +86,10 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_ovhcloud_embed_documents" + # duckdb-engine needs python-wasmer which is not yet available in Python 3.12 + # See https://github.com/NixOS/nixpkgs/pull/326337 and https://github.com/wasmerio/wasmer-python/issues/778 + "test_table_info" + "test_sql_database_run" ]; meta = { From a9afe0c06589bc7fce94be52dfda5b4338d5b7ea Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:33:44 +0200 Subject: [PATCH 45/57] houdini: move meta to package definition --- pkgs/applications/misc/houdini/default.nix | 10 ++++++++++ pkgs/applications/misc/houdini/runtime-build.nix | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 64536177aaff..802d4fe3e675 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -100,4 +100,14 @@ buildFHSEnv rec { export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH exec "$@" ''; + + meta = { + description = "3D animation application software"; + homepage = "https://www.sidefx.com"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + mainProgram = "houdini"; + hydraPlatforms = [ ]; # requireFile src's should be excluded + maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; + }; } diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/applications/misc/houdini/runtime-build.nix index 60f27c194964..27e6f098574e 100644 --- a/pkgs/applications/misc/houdini/runtime-build.nix +++ b/pkgs/applications/misc/houdini/runtime-build.nix @@ -23,13 +23,4 @@ stdenv.mkDerivation rec { ''; dontFixup = true; - - meta = with lib; { - description = "3D animation application software"; - homepage = "https://www.sidefx.com"; - license = licenses.unfree; - platforms = platforms.linux; - hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with maintainers; [ canndrew kwohlfahrt ]; - }; } From 39103842ab619989116e07564f71dce7e7cc32b1 Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Thu, 11 Jul 2024 16:20:48 +0200 Subject: [PATCH 46/57] maintainers: add pedohorse --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/misc/houdini/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 01211d6d7be8..1478567e99ac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15500,6 +15500,11 @@ githubId = 943430; name = "David Hagege"; }; + pedohorse = { + github = "pedohorse"; + githubId = 13556996; + name = "pedohorse"; + }; pedrohlc = { email = "root@pedrohlc.com"; github = "PedroHLC"; diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 802d4fe3e675..4a0a24239a0b 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -108,6 +108,6 @@ buildFHSEnv rec { platforms = [ "x86_64-linux" ]; mainProgram = "houdini"; hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; + maintainers = with lib.maintainers; [ canndrew kwohlfahrt pedohorse ]; }; } From 10cb58ef701e84470a210db3af7a2ef9c7d32ad1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jul 2024 12:48:32 +0200 Subject: [PATCH 47/57] osc: update from 1.8.0 to 1.8.3 --- pkgs/development/python-modules/osc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 0b083f5d2be7..ba8840da2fdc 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "osc"; - version = "1.8.0"; + version = "1.8.3"; format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - hash = "sha256-YYcTZ4TB/wDl+T3yF5n2Wp0r4v8eWCTO2fjv/ygicmM="; + hash = "sha256-SREq0rZuCiILBG4RdvtxkTOGKJuYBS3GypLZnSdBvVI="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper From 03d414a125e7fb4033b7866851e942439cfb8426 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 12 Jul 2024 18:52:42 +0800 Subject: [PATCH 48/57] nixos/vim: improve warning message --- nixos/modules/programs/vim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix index 7fb50e0f4147..c84f966eb3a7 100644 --- a/nixos/modules/programs/vim.nix +++ b/nixos/modules/programs/vim.nix @@ -20,7 +20,7 @@ in # TODO: convert it into assert after 24.11 release config = lib.mkIf (cfg.enable || cfg.defaultEditor) { warnings = lib.mkIf (cfg.defaultEditor && !cfg.enable) [ - "programs.vim.defaultEditor will only work if programs.vim.enable is enabled, will be encfored after the 24.11 release" + "programs.vim.defaultEditor will only work if programs.vim.enable is enabled, which will be enforced after the 24.11 release" ]; environment = { systemPackages = [ cfg.package ]; From 7188fd1fa91787b0c9a271036b0e1ebed6a960d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 11:34:43 +0000 Subject: [PATCH 49/57] python312Packages.opower: 0.5.0 -> 0.5.2 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 3aea4088e47a..e6cc3d7c814a 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-Rv5ttUUlBqa4yFEV5WWrZ+fhL/mrvjoYFsMN6xnFUhQ="; + hash = "sha256-aK/zpeSe9GBONDbFqLF6ZGkBkhp2/GzH5gg3hfJcl/U="; }; build-system = [ setuptools ]; From d9779c5002dbd20b666683858119e608faefb632 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 12 Jul 2024 14:01:30 +0200 Subject: [PATCH 50/57] python312Packages.pytest: remove optional nose dependency It was removed in the 8.1.0 release cycle. --- pkgs/development/python-modules/pytest/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 558909a61d25..38675d502277 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -4,7 +4,6 @@ callPackage, pythonOlder, fetchPypi, - fetchpatch2, writeText, # build-system @@ -23,7 +22,6 @@ argcomplete, hypothesis, mock, - nose, pygments, requests, xmlschema, @@ -72,7 +70,6 @@ buildPythonPackage rec { attrs hypothesis mock - nose pygments requests setuptools From bbc168ab4cafa2c44d53fb77e7dae76d51487355 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 12 Jul 2024 09:01:55 -0300 Subject: [PATCH 51/57] k3s: use team for maintainers --- maintainers/team-list.nix | 14 ++++++++++++++ nixos/modules/services/cluster/k3s/default.nix | 2 ++ nixos/tests/k3s/auto-deploy.nix | 2 ++ nixos/tests/k3s/etcd.nix | 2 +- nixos/tests/k3s/multi-node.nix | 4 ++-- nixos/tests/k3s/single-node.nix | 3 ++- .../networking/cluster/k3s/builder.nix | 9 +-------- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f54d0f435249..d5fd82892822 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -496,6 +496,20 @@ with lib.maintainers; shortName = "Jupyter"; }; + k3s = { + githubTeams = [ "k3s" ]; + members = [ + euank + marcusramberg + mic92 + superherointj + wrmilling + yajo + ]; + scope = "Maintain K3s package, NixOS module, NixOS tests, update script"; + shortName = "K3s"; + }; + kubernetes = { members = [ johanot diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 32d8f3dfecd5..9274779088a6 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -432,4 +432,6 @@ in }; }; }; + + meta.maintainers = lib.teams.k3s.members; } diff --git a/nixos/tests/k3s/auto-deploy.nix b/nixos/tests/k3s/auto-deploy.nix index c2fae36c60be..19be88dc7402 100644 --- a/nixos/tests/k3s/auto-deploy.nix +++ b/nixos/tests/k3s/auto-deploy.nix @@ -118,5 +118,7 @@ import ../make-test-python.nix ( machine.shutdown() ''; + + meta.maintainers = lib.teams.k3s.members; } ) diff --git a/nixos/tests/k3s/etcd.nix b/nixos/tests/k3s/etcd.nix index ac0aa9047251..fa6012afd54c 100644 --- a/nixos/tests/k3s/etcd.nix +++ b/nixos/tests/k3s/etcd.nix @@ -125,6 +125,6 @@ import ../make-test-python.nix ( etcd.shutdown() ''; - meta.maintainers = etcd.meta.maintainers ++ k3s.meta.maintainers; + meta.maintainers = etcd.meta.maintainers ++ lib.teams.k3s.members; } ) diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index b618d2aff34c..504ac10d96c1 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -189,8 +189,6 @@ import ../make-test-python.nix ( }; }; - meta.maintainers = k3s.meta.maintainers; - testScript = '' machines = [server, server2, agent] for m in machines: @@ -239,5 +237,7 @@ import ../make-test-python.nix ( for m in machines: m.shutdown() ''; + + meta.maintainers = lib.teams.k3s.members; } ) diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index 80d80a55ddf4..220f6086b092 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -40,7 +40,6 @@ import ../make-test-python.nix ( in { name = "${k3s.name}-single-node"; - meta.maintainers = k3s.meta.maintainers; nodes.machine = { pkgs, ... }: @@ -120,5 +119,7 @@ import ../make-test-python.nix ( machine.shutdown() ''; + + meta.maintainers = lib.teams.k3s.members; } ) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 9d19d13af8a1..45eaa31e301f 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -92,14 +92,7 @@ let description = "Lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ - euank - mic92 - marcusramberg - superherointj - wrmilling - yajo - ]; + maintainers = lib.teams.k3s.members; platforms = platforms.linux; # resolves collisions with other installations of kubectl, crictl, ctr From 5266d2da667a62ca38c0375bc62dc53a97e70616 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 12 Jul 2024 10:01:18 -0300 Subject: [PATCH 52/57] k3s/tests/auto-deploy: fix auto-deploy reference * re-establish alphabetical order * fix typo on comment --- nixos/tests/k3s/default.nix | 4 ++-- pkgs/applications/networking/cluster/k3s/builder.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index b8a3ace44f3e..529cf312be7e 100644 --- a/nixos/tests/k3s/default.nix +++ b/nixos/tests/k3s/default.nix @@ -7,6 +7,8 @@ let allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs; in { + # Test whether container images are imported and auto deploying manifests work + auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s; # Testing K3s with Etcd backend etcd = lib.mapAttrs ( _: k3s: @@ -19,6 +21,4 @@ in single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s; # Run a multi-node k3s cluster and verify pod networking works across nodes multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s; - # Test wether container images are imported and auto deploying manifests work - auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s; } diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 45eaa31e301f..4973b5e67db9 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -419,6 +419,7 @@ buildGoModule rec { k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version); in { + auto-deploy = nixosTests.k3s.auto-deploy.${k3s_version}; etcd = nixosTests.k3s.etcd.${k3s_version}; single-node = nixosTests.k3s.single-node.${k3s_version}; multi-node = nixosTests.k3s.multi-node.${k3s_version}; From dc6634ea7057e72b76f044a5965c5bdbcfe06fa0 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Fri, 12 Jul 2024 19:20:33 +0800 Subject: [PATCH 53/57] tiny-dfr: 0.3.0 -> 0.3.0-unstable-2024-07-10 --- pkgs/by-name/ti/tiny-dfr/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix index 2fe4da3bd84f..c2e3de8628a5 100644 --- a/pkgs/by-name/ti/tiny-dfr/package.nix +++ b/pkgs/by-name/ti/tiny-dfr/package.nix @@ -2,18 +2,18 @@ , cairo, gdk-pixbuf, glib, libinput, libxml2, pango, udev }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "tiny-dfr"; - version = "0.3.0"; + version = "0.3.0-unstable-2024-07-10"; src = fetchFromGitHub { owner = "WhatAmISupposedToPutHere"; repo = "tiny-dfr"; - rev = "v${version}"; - hash = "sha256-LH6r0HeUJ69Q98WlWjsl5ASHjcxGfD9bYjSy6fw/UJM="; + rev = "a066ded870d8184db81f16b4b55d0954b2ab4c88"; + hash = "sha256-++TezIILx5FXJzIxVfxwNTjZiGGjcZyih2KBKwD6/tU="; }; - cargoHash = "sha256-3bFtfDSm27gDAmIkvxYyJoPtcuKYkPH3vK9V5rJ4O0c="; + cargoHash = "sha256-q0yx4QT6L1G+5PvstXjA4aa0kZPhQTpM8h69dd/1Mcw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ]; From 953ace525dfdbb9a9349defb49626b654d4e257e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Jul 2024 17:13:03 +0200 Subject: [PATCH 54/57] python312Packages.homeconnect: 0.7.4 -> 0.8.0 Changelog: https://github.com/DavidMStraub/homeconnect/releases/tag/v0.8.0 --- .../python-modules/homeconnect/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index aa2629ff2d80..ad1ce2a29102 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -6,27 +6,25 @@ requests-oauthlib, pythonOlder, setuptools, - six, }: buildPythonPackage rec { pname = "homeconnect"; - version = "0.7.4"; - format = "pyproject"; + version = "0.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lkal6Dy4cRRZ893I3/jyQ3+sDZMrHN0UMGff0ab4pvk="; + hash = "sha256-W475a+TlGiKRR1EDYiFVmApmQfmft85iBQLRnbEmcuA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests requests-oauthlib - six ]; # Project has no tests @@ -38,7 +36,7 @@ buildPythonPackage rec { description = "Python client for the BSH Home Connect REST API"; homepage = "https://github.com/DavidMStraub/homeconnect"; changelog = "https://github.com/DavidMStraub/homeconnect/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 1f7897b9cd8df684eceac20f4b14e8bb1a5b7db7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 15:34:54 +0000 Subject: [PATCH 55/57] vdr: 2.6.7 -> 2.6.8 --- pkgs/applications/video/vdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 5713aeb954af..d0d486c11cf0 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.7"; + version = "2.6.8"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - hash = "sha256-6i3EQgARwMLNejgB0NevmLmd9OrNBvjqW+qLrAdqUxE="; + hash = "sha256-Q6m/0Px4wLkd1GOKLFFRBVywYoIBh6W1BHh3pbtmgfU="; }; enableParallelBuilding = true; From 3e37f9d67e23337dd9037eb18229376bed52dd26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Jul 2024 02:10:40 +1000 Subject: [PATCH 56/57] prom2json: 1.3.3 -> 1.4.0 (#326447) --- pkgs/servers/monitoring/prometheus/prom2json.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index a011dbb68b7e..7b6b0e473907 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prom2json"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prom2json"; - sha256 = "sha256-VwJv2Y+YrlhLRx0lRPtHTzjvSz7GPfADCZibkQU6S1Y="; + sha256 = "sha256-oOnrIGtNQqS/7XCKcFtzXskv7N6syNyS52pZMwrY5wU="; }; - vendorHash = "sha256-m9f3tCX21CMdcXcUcLFOxgs9oDR2Uaj5u22eJPDmpeE="; + vendorHash = "sha256-d+/38wUMFChuLlVb84DELRQylCDIqopzk2bw/yd5B/E="; meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; From 836c11a6f6eac0e621f60633719e1ced1262b123 Mon Sep 17 00:00:00 2001 From: volesen Date: Thu, 11 Jul 2024 13:34:22 +0200 Subject: [PATCH 57/57] nim: 2.0.4 -> 2.0.8 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 513a810adba4..4655cb03ad7b 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -76,12 +76,12 @@ in { nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.0.4"; + version = "2.0.8"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-cVJr0HQ53I43j6Gm60B+2hKY8fPU30R23KDjyjy+Pwk="; + hash = "sha256-VwLahEcA0xKdtzFwtcYGrb37h+grgWwNkRB+ogpl3xY="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]