From 7cc5a44a61ac1bab1c998e78e0974d61c8af601e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Fri, 10 Jan 2025 20:32:43 +0100 Subject: [PATCH 001/348] make-initrd: use closureInfo --- pkgs/build-support/kernel/make-initrd.nix | 11 +---------- pkgs/build-support/kernel/make-initrd.sh | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index ef591a4d9aa5..946db43afdee 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -20,7 +20,6 @@ let in { stdenvNoCC, - perl, cpio, ubootTools, lib, @@ -101,7 +100,6 @@ stdenvNoCC.mkDerivation ( builder = ./make-initrd.sh; nativeBuildInputs = [ - perl cpio ] ++ lib.optional makeUInitrd ubootTools; @@ -121,14 +119,7 @@ stdenvNoCC.mkDerivation ( symlinks = map (x: x.symlink) contents; suffices = map (x: if x ? suffix then x.suffix else "none") contents; - # For obtaining the closure of `contents'. - # Note: we don't use closureInfo yet, as that won't build with nix-1.x. - # See #36268. - exportReferencesGraph = lib.zipListsWith (x: i: [ - ("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") - x.object - ]) contents (lib.range 0 (lib.length contents - 1)); - pathsFromGraph = ./paths-from-graph.pl; + closureInfo = "${pkgsBuildHost.closureInfo { rootPaths = objects; }}"; } // lib.optionalAttrs makeUInitrd { uInitrdCompression = uInitrdCompression; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 0149c5d487ac..b0f2341fbf66 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -26,7 +26,7 @@ done # Get the paths in the closure of `object'. -storePaths=$(perl $pathsFromGraph closure-*) +storePaths="$(cat $closureInfo/store-paths)" # Paths in cpio archives *must* be relative, otherwise the kernel From e540245ee4a75bde32c931734d5603414ae32f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Thu, 23 Jan 2025 16:19:39 +0100 Subject: [PATCH 002/348] pkgs/pathsFromGraph: drop Nix 2.* is widely used now, so closureInfo should be used instead. --- pkgs/build-support/kernel/paths-from-graph.pl | 68 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/build-support/kernel/paths-from-graph.pl diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl deleted file mode 100644 index 1465b73fddb6..000000000000 --- a/pkgs/build-support/kernel/paths-from-graph.pl +++ /dev/null @@ -1,68 +0,0 @@ -# NOTE: this script is deprecated. Use closureInfo instead. - -# Parses a /nix/store/*-closure file and prints -# various information. -# By default, the nodes in the graph are printed to stdout. -# If printRegistration is set, then the graph is written -# as a registration file for a manifest is written -# in the `nix-store --load-db' format. - -use strict; -use File::Basename; - -my %storePaths; -my %refs; - -# Each argument on the command line is a graph file. -# The graph file contains line-triples and a variable -# number of references: -# -# -# -# -# ... -# -foreach my $graph (@ARGV) { - open GRAPH, "<$graph" or die; - - while () { - chomp; - my $storePath = "$_"; - $storePaths{$storePath} = 1; - - my $deriver = ; chomp $deriver; - my $count = ; chomp $count; - - my @refs = (); - for (my $i = 0; $i < $count; ++$i) { - my $ref = ; chomp $ref; - push @refs, $ref; - } - $refs{$storePath} = \@refs; - - } - - close GRAPH; -} - - -if ($ENV{"printRegistration"} eq "1") { - # This is the format used by `nix-store --register-validity - # --hash-given' / `nix-store --load-db'. - foreach my $storePath (sort (keys %storePaths)) { - print "$storePath\n"; - print "0000000000000000000000000000000000000000000000000000000000000000\n"; # !!! fix - print "0\n"; # !!! fix - print "\n"; # don't care about preserving the deriver - print scalar(@{$refs{$storePath}}), "\n"; - foreach my $ref (@{$refs{$storePath}}) { - print "$ref\n"; - } - } -} - -else { - foreach my $storePath (sort (keys %storePaths)) { - print "$storePath\n"; - } -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 453805988349..2f108911ad91 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1028,6 +1028,7 @@ mapAliases { packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 + pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead";# Added 2025-01-23 paperless-ng = paperless-ngx; # Added 2022-04-11 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 patchelfStable = patchelf; # Added 2024-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 147d5b23b31b..95c0603e02b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -727,8 +727,6 @@ with pkgs; callPackages ../build-support/setup-hooks/patch-rc-path-hooks { } ) patchRcPathBash patchRcPathCsh patchRcPathFish patchRcPathPosix; - pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; - pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } ../build-support/setup-hooks/prune-libtool-files.sh; From 683a958ba529e709cd1c6da526f708492e8fb04e Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:00:16 +0800 Subject: [PATCH 003/348] sl1-to-photon: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/applications/misc/sl1-to-photon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index f9bd5c9d0c1f..5c78d28b090e 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -31,7 +31,6 @@ buildPythonApplication rec { ]; format = "setuptools"; - dontUseSetuptoolsCheck = true; installPhase = '' install -D -m 0755 SL1_to_Photon.py $out/bin/${pname} From 24d578228c8588a93cef075f031a7fa8c105410a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:01:05 +0800 Subject: [PATCH 004/348] sourcehut.coresrht: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/applications/version-management/sourcehut/core.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 5fa4c086482b..c8dc6e41ce9c 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -83,7 +83,6 @@ buildPythonPackage rec { PKGVER = version; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "srht" ]; meta = with lib; { From 92f50eebdaddc9b19499310abac572b8ab62e217 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:05:55 +0800 Subject: [PATCH 005/348] sourcehut: scmsrht: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/applications/version-management/sourcehut/scm.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index ea7ba30aa656..cdccbe1a56e6 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -37,8 +37,6 @@ buildPythonPackage rec { export PKGVER=${version} ''; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "scmsrht" ]; meta = with lib; { From 608c8ab7487f0edfab3abc3acd122c5c02e9ef31 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:06:49 +0800 Subject: [PATCH 006/348] sourcehut.todosrht: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/applications/version-management/sourcehut/todo.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index e920333c3115..de43d829fb4e 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -72,8 +72,6 @@ buildPythonPackage rec { pytest factory-boy ]; - - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "todosrht" ]; meta = with lib; { From 7d594dc01b2f9524f6fafaeeb0da0383214c2845 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:07:19 +0800 Subject: [PATCH 007/348] hifiscan: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/by-name/hi/hifiscan/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/hi/hifiscan/package.nix b/pkgs/by-name/hi/hifiscan/package.nix index deedff446c16..3f8ad858d683 100644 --- a/pkgs/by-name/hi/hifiscan/package.nix +++ b/pkgs/by-name/hi/hifiscan/package.nix @@ -20,8 +20,6 @@ python3Packages.buildPythonApplication { pyqtgraph ]; - dontUseSetuptoolsCheck = true; - src = fetchPypi { inherit pname version hash; }; From 9af28577c63a14d10fecc90ecec80629310bcdf9 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:08:08 +0800 Subject: [PATCH 008/348] octoprint: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/by-name/oc/octoprint/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index 4a9d9b5d02b7..1079e1941456 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -232,8 +232,6 @@ let setup.py ''; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$(mktemp -d) rm pytest.ini From 848739146b1ff1fcb98b942330a159204dd0523a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:16:46 +0800 Subject: [PATCH 009/348] waydroid: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/by-name/wa/waydroid/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index 63a9a0343518..d97feb4bd87d 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -57,7 +57,6 @@ python3Packages.buildPythonApplication rec { dontUseSetuptoolsBuild = true; dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; dontWrapGApps = true; From f5afa98f5852e55aea243fd6eff80e8a6b8aa49d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:17:44 +0800 Subject: [PATCH 010/348] python3Packages.blivet: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/blivet/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 3ddfbf0b8503..fe09f4028541 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -92,10 +92,6 @@ buildPythonPackage rec { # TODO: Write a NixOS VM test? doCheck = false; - # Fails with: TypeError: don't know how to make test from: - # - dontUseSetuptoolsCheck = true; - meta = { description = "Python module for system storage configuration"; homepage = "https://github.com/storaged-project/blivet"; From 8d9f4201fc91e58b648e33587ac1aab32bdd9171 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:18:30 +0800 Subject: [PATCH 011/348] python3Packages.eventkit: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/eventkit/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/eventkit/default.nix b/pkgs/development/python-modules/eventkit/default.nix index fb25e87fd953..c9c36d91d534 100644 --- a/pkgs/development/python-modules/eventkit/default.nix +++ b/pkgs/development/python-modules/eventkit/default.nix @@ -15,7 +15,6 @@ buildPythonPackage { src = fetchPypi { inherit pname version hash; }; propagatedBuildInputs = [ numpy ]; - dontUseSetuptoolsCheck = true; meta = with lib; { homepage = "https://github.com/erdewit/eventkit"; From 27f2b5f3645560520ef8cac2cbc91f9265e04db5 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:18:56 +0800 Subject: [PATCH 012/348] python3Packages.fastdtw: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/fastdtw/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix index 09c03c5b433c..5d55886302b0 100644 --- a/pkgs/development/python-modules/fastdtw/default.nix +++ b/pkgs/development/python-modules/fastdtw/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "fastdtw.fastdtw" ]; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; # looks for pytest-runner preCheck = '' echo "Temporarily moving tests to $OUT to find cython modules" export PACKAGEDIR=$out/${python.sitePackages} From f87a78659af727c426a2f3fc0e37f43b8795b71f Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:19:16 +0800 Subject: [PATCH 013/348] python3Packages.fastjsonschema: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/fastjsonschema/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 4b518e5f8ef1..9714730abfe2 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -33,8 +33,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - disabledTests = [ "benchmark" From 3e8fa6fd14833ab8b98710bfad668e066b545461 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:19:50 +0800 Subject: [PATCH 014/348] python3Packages.h5netcdf: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/h5netcdf/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 722f5b17a8f8..fee1fb5c7010 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -34,8 +34,6 @@ buildPythonPackage rec { netcdf4 ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "h5netcdf" ]; meta = with lib; { From 8b03aec28388fc6e35ffcf7875d33801d32c37fd Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:20:16 +0800 Subject: [PATCH 015/348] python3Packages.meep: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/meep/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index e9810167d395..acb4a056ef87 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -95,7 +95,6 @@ buildPythonPackage rec { dontUseSetuptoolsBuild = true; dontUsePipInstall = true; - dontUseSetuptoolsCheck = true; enableParallelBuilding = true; From 99ef966095f4a3b2f1b007b2a65e417e05166926 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:20:37 +0800 Subject: [PATCH 016/348] python3Packages.mnist: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/mnist/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 25f2106e20cb..7e9d02346c01 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - # disable tests which fail due to socket related errors disabledTests = [ "test_test_images_has_right_size" From 60efacfe5b74f9bf87ba5121e284957d2321c6ba Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:21:05 +0800 Subject: [PATCH 017/348] python3Packages.napari: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/napari/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index e68941e7d37d..29cdab78a4d7 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -99,8 +99,6 @@ mkDerivationWith buildPythonPackage rec { wrapt ] ++ dask.optional-dependencies.array; - dontUseSetuptoolsCheck = true; - postFixup = '' wrapQtApp $out/bin/napari ''; From 9b09547993facf7cbb7e965c7c3158064ff7a65b Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:22:09 +0800 Subject: [PATCH 018/348] python3Packages.pyarrow: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/pyarrow/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 46a1151edd04..9b0cf844422a 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -142,8 +142,6 @@ buildPythonPackage rec { disabledTests = [ "GcsFileSystem" ]; - dontUseSetuptoolsCheck = true; - preCheck = '' shopt -s extglob From aa18717844567f4c8dac0ce80f7780a38cf59ea6 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:22:28 +0800 Subject: [PATCH 019/348] python3Packages.pycoin: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/pycoin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index f947b3a3e4f5..f1dc2cbe8fd7 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - # Disable tests depending on online services disabledTests = [ "ServicesTest" From 32045f2b1406257b1aebe51f6fa2dd819cc70af1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:22:59 +0800 Subject: [PATCH 020/348] python3Packages.pylint: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/pylint/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index e662589d9621..ce93e38dd4b5 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -70,8 +70,6 @@ buildPythonPackage rec { "-v" ]; - dontUseSetuptoolsCheck = true; - preCheck = '' export HOME=$TEMPDIR ''; From 2663549ab199d0ed4a00eeff41c32fddf40a5464 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:23:53 +0800 Subject: [PATCH 021/348] python3Packages.pyhotonfile: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/pyphotonfile/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix index 315d9c9496ed..9cac35c226d0 100644 --- a/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -13,7 +13,6 @@ buildPythonPackage { format = "setuptools"; inherit version; - dontUseSetuptoolsCheck = true; propagatedBuildInputs = [ pillow numpy From 697aff19cc694400d363add805bd8d49ad154f3e Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:24:25 +0800 Subject: [PATCH 022/348] python3Packages.python-constraint: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/python-constraint/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix index 2a9dfd05a459..ae00c34c3354 100644 --- a/pkgs/development/python-modules/python-constraint/default.nix +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -19,7 +19,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; meta = with lib; { description = "Constraint Solving Problem resolver for Python"; From f40cd8c730a1433f2b315407c6d055996498b3f3 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:25:02 +0800 Subject: [PATCH 023/348] python3Packages.python3-eventlib: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/python3-eventlib/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix index 0181dfebb87e..0904441944de 100644 --- a/pkgs/development/python-modules/python3-eventlib/default.nix +++ b/pkgs/development/python-modules/python3-eventlib/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { greenlet ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "eventlib" ]; meta = with lib; { From b3101e9d6f971011d157c95470923ae5a35c4c73 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:25:30 +0800 Subject: [PATCH 024/348] python3Packages.qiskit-ignis: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/qiskit-ignis/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index a51ad99805b9..940b5bd556f1 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -50,7 +50,6 @@ buildPythonPackage rec { # Tests pythonImportsCheck = [ "qiskit.ignis" ]; - dontUseSetuptoolsCheck = true; preCheck = '' export HOME=$TMPDIR ''; From 3d74ee56c3ad3c98e7ba8011a8abb4aed2b12b36 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:29:34 +0800 Subject: [PATCH 025/348] python3Packages.recommonmark: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/recommonmark/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 0569adc5b93e..a61f2804d71f 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { sphinx ]; - dontUseSetuptoolsCheck = true; - disabledTests = [ # https://github.com/readthedocs/recommonmark/issues/164 "test_lists" From 86cc66b5564cd44e3015489ccb891766e5cbbe51 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:30:11 +0800 Subject: [PATCH 026/348] python3Packages.three-merge: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/development/python-modules/three-merge/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix index e20e1aea09ac..62d2892a48a4 100644 --- a/pkgs/development/python-modules/three-merge/default.nix +++ b/pkgs/development/python-modules/three-merge/default.nix @@ -17,8 +17,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ diff-match-patch ]; - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "three_merge" ]; meta = with lib; { From ae07f630cf6e80f56d088bfb9d207eb368ba2f35 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:32:41 +0800 Subject: [PATCH 027/348] maubot: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/tools/networking/maubot/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix index add134333a46..f42051761540 100644 --- a/pkgs/tools/networking/maubot/default.nix +++ b/pkgs/tools/networking/maubot/default.nix @@ -93,9 +93,6 @@ let rm $out/example-config.yaml ''; - # Setuptools is trying to do python -m maubot test - dontUseSetuptoolsCheck = true; - pythonImportsCheck = [ "maubot" ]; From 3a9616c23e39fcab3cba9505fce5dd7b64f7b7c7 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:33:43 +0800 Subject: [PATCH 028/348] s3cmd: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/tools/networking/s3cmd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 767fc3011fd8..96dae1f4c682 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -22,8 +22,6 @@ buildPythonApplication rec { python-dateutil ]; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://s3tools.org/s3cmd"; description = "Command line tool for managing Amazon S3 and CloudFront services"; From 6cf4bb37f597e0fc654828ae8d1ad9588c504bbe Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 05:16:03 +0800 Subject: [PATCH 029/348] persepolis: remove nativeCheckInputs specification setuptooolsCheckHooks has been removed. --- pkgs/by-name/pe/persepolis/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index f76b8848e311..dce1e844d5f0 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -38,15 +38,6 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; - # The presence of these dependencies is checked during setuptoolsCheckPhase, - # but apart from that, they're not required during build, only runtime - nativeCheckInputs = [ - libnotify - pulseaudio - sound-theme-freedesktop - ffmpeg - ]; - propagatedBuildInputs = [ pulseaudio sound-theme-freedesktop From 0a8e3a0b656a92fd485f5345840ffac45f845412 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 24 Feb 2025 07:14:34 +0000 Subject: [PATCH 030/348] liblc3: 1.1.2 -> 1.1.3 Changes: https://github.com/google/liblc3/releases/tag/v1.1.3 --- pkgs/by-name/li/liblc3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liblc3/package.nix b/pkgs/by-name/li/liblc3/package.nix index 8ab037e596bb..4428d1e5220b 100644 --- a/pkgs/by-name/li/liblc3/package.nix +++ b/pkgs/by-name/li/liblc3/package.nix @@ -8,7 +8,7 @@ let name = "liblc3"; - version = "1.1.2"; + version = "1.1.3"; in stdenv.mkDerivation { pname = name; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-OWuj68+YztIh/dPvwqjW7ch7Ph3aiEIDvO9rMkVIrQ8="; + sha256 = "sha256-4KsvCQ1JZaj0yCT7En7ZcNk0rA8LyDwwcSga2IoVd6A="; }; outputs = [ From 7ab5218d3eec21d9b1b5f435914f820ecc8fc404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Feb 2025 19:25:46 +0100 Subject: [PATCH 031/348] libredirect: log that hook is being activated --- pkgs/by-name/li/libredirect/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/libredirect/package.nix b/pkgs/by-name/li/libredirect/package.nix index ebc52708dded..01b68506a7f6 100644 --- a/pkgs/by-name/li/libredirect/package.nix +++ b/pkgs/by-name/li/libredirect/package.nix @@ -104,6 +104,7 @@ else # Provide a setup hook that injects our library into every process. mkdir -p "$hook/nix-support" cat < "$hook/nix-support/setup-hook" + echo "Setting up libredirect" ${ if stdenv.hostPlatform.isDarwin then '' From 43529b6db8eb715b02896d1b6275e96c3a50432f Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 27 Feb 2025 22:21:15 +0100 Subject: [PATCH 032/348] chromaprint: format with nixfmt and refactor --- pkgs/by-name/ch/chromaprint/package.nix | 56 ++++++++++++++++--------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 539e6333419d..cb06f24c4dbe 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, fetchpatch2 -, cmake -, ninja -, ffmpeg -, darwin -, zlib +{ + lib, + stdenv, + fetchurl, + fetchpatch, + fetchpatch2, + cmake, + ninja, + ffmpeg, + darwin, + zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chromaprint"; version = "1.5.1"; src = fetchurl { - url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/acoustid/chromaprint/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw="; }; @@ -40,18 +41,33 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; - buildInputs = [ ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isDarwin - (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); + buildInputs = + [ ffmpeg ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreGraphics + CoreVideo + zlib + ] + ); - cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; + cmakeFlags = [ + "-DBUILD_EXAMPLES=ON" + "-DBUILD_TOOLS=ON" + ]; - meta = with lib; { + meta = { homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; mainProgram = "fpcalc"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; -} +}) From 135b8b44104d83d8fefdec2bc9e68d5647fca78c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 27 Feb 2025 22:28:52 +0100 Subject: [PATCH 033/348] chromaprint: use ffmpeg-headless --- pkgs/by-name/ch/chromaprint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index cb06f24c4dbe..136da146b03f 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -6,7 +6,7 @@ fetchpatch2, cmake, ninja, - ffmpeg, + ffmpeg-headless, darwin, zlib, }: @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - [ ffmpeg ] + [ ffmpeg-headless ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ From e57ebfcbf8800cd2d6ece06c6d752f34ae78b605 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 27 Feb 2025 22:36:52 +0100 Subject: [PATCH 034/348] chromaprint: switch from fetchurl to fetchFromGitHub --- pkgs/by-name/ch/chromaprint/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 136da146b03f..7240a065ee7d 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, fetchpatch, fetchpatch2, cmake, @@ -15,9 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "chromaprint"; version = "1.5.1"; - src = fetchurl { - url = "https://github.com/acoustid/chromaprint/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw="; + src = fetchFromGitHub { + owner = "acoustid"; + repo = "chromaprint"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bFplHaqXYvGbl8E8b/HUNFO4X+B/HPZjGTmuVFPjS3g="; }; patches = [ From 11ce07956ee8cfbc28a09657f84c9aa331213827 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 27 Feb 2025 22:43:39 +0100 Subject: [PATCH 035/348] chromaprint: make building tools and examples optional --- pkgs/by-name/ch/chromaprint/package.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 7240a065ee7d..88bdec77a49b 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -9,6 +9,8 @@ ffmpeg-headless, darwin, zlib, + withExamples ? true, + withTools ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -61,15 +63,18 @@ stdenv.mkDerivation (finalAttrs: { ); cmakeFlags = [ - "-DBUILD_EXAMPLES=ON" - "-DBUILD_TOOLS=ON" + (lib.cmakeBool "BUILD_EXAMPLES" withExamples) + (lib.cmakeBool "BUILD_TOOLS" withTools) ]; - meta = { - homepage = "https://acoustid.org/chromaprint"; - description = "AcoustID audio fingerprinting library"; - mainProgram = "fpcalc"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.unix; - }; + meta = + { + homepage = "https://acoustid.org/chromaprint"; + description = "AcoustID audio fingerprinting library"; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + } + // lib.attrsets.optionalAttrs withTools { + mainProgram = "fpcalc"; + }; }) From 4c97e7d59655177ee84f52a33a86ee1b92d6785e Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 27 Feb 2025 22:55:36 +0100 Subject: [PATCH 036/348] chromaprint: add pkg-config validation --- pkgs/by-name/ch/chromaprint/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 88bdec77a49b..742243276234 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -9,6 +9,8 @@ ffmpeg-headless, darwin, zlib, + testers, + validatePkgConfig, withExamples ? true, withTools ? true, }: @@ -48,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja + validatePkgConfig ]; buildInputs = @@ -67,12 +70,15 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_TOOLS" withTools) ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.unix; + pkgConfigModules = [ "libchromaprint" ]; } // lib.attrsets.optionalAttrs withTools { mainProgram = "fpcalc"; From 38a133a966018812de2b9672c420888ef8de4d32 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 27 Feb 2025 23:07:16 +0100 Subject: [PATCH 037/348] chromaprint: add nix-update-script --- pkgs/by-name/ch/chromaprint/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 742243276234..457f6985a7e0 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -11,6 +11,7 @@ zlib, testers, validatePkgConfig, + nix-update-script, withExamples ? true, withTools ? true, }: @@ -70,7 +71,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_TOOLS" withTools) ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + updateScript = nix-update-script { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = { From 071b4f5a0066712e0dd7acc646c5b99ca0e3f70f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Mar 2025 19:59:35 +0000 Subject: [PATCH 038/348] zap-chip: 2024.09.27 -> 2025.02.26 --- pkgs/by-name/za/zap-chip/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix index 882f72805bb1..cd665e81cbc0 100644 --- a/pkgs/by-name/za/zap-chip/package.nix +++ b/pkgs/by-name/za/zap-chip/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "zap-chip"; - version = "2024.09.27"; + version = "2025.02.26"; src = fetchFromGitHub { owner = "project-chip"; repo = "zap"; rev = "v${version}"; - hash = "sha256-Dc5rU4jJ6aJpk8mwL+XNSmtisYxF86VzXd/Aacd4p0o="; + hash = "sha256-oYw1CxeCr4dUpw7hhXjtB+QwTfBI7rG9jgfxWKZYsSc="; }; - npmDepsHash = "sha256-ZFksGwKlXkz6XTs2QdalGB0hR16HfB69XQOFWI9X/KY="; + npmDepsHash = "sha256-dcnJfxgF1S2gyR+wPnBD4AFzix5Sdq2ZqDlXvWAFb8s="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.CYPRESS_INSTALL_BINARY = "0"; From 638bd0c219a41206a7bd6dd48dad2e6f7e25c47b Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 1 Mar 2025 14:31:11 -0800 Subject: [PATCH 039/348] cryptsetup: buildInputs -> propagatedBuildInputs util-linux has a runtime dependency on these, so propagate them. --- pkgs/by-name/cr/cryptsetup/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 8c35acda3e72..0483c3f33185 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ (lib.mapAttrsToList (lib.flip lib.enableFeature)) programs; nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ]; - buildInputs = [ + propagatedBuildInputs = [ lvm2 json_c openssl From 12ccc770aacdc80e057a87d4e82b5ec1df46c015 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 1 Mar 2025 14:32:56 -0800 Subject: [PATCH 040/348] cryptsetup: adopt --- pkgs/by-name/cr/cryptsetup/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 0483c3f33185..3e2b74a4d588 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -106,7 +106,10 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes"; license = lib.licenses.gpl2Plus; mainProgram = "cryptsetup"; - maintainers = with lib.maintainers; [ raitobezarius ]; + maintainers = with lib.maintainers; [ + numinit + raitobezarius + ]; platforms = with lib.platforms; linux; }; } From cca1a97f4dec8383ddecb87750bd1acf61739774 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 1 Mar 2025 13:30:22 -0800 Subject: [PATCH 041/348] util-linux: add cryptsetup support Various tools (see mount.8) have extra features that only work if util-linux is linked with cryptsetup. Allow enabling it so things like this work: https://man7.org/linux/man-pages/man8/mount.8.html#DM-VERITY_SUPPORT Do not enable it by default since `mount` is setuid, and pulling all of OpenSSL into a setuid context seems like a quite easy way to cause a privesc vulnerability. --- pkgs/by-name/ut/util-linux/package.nix | 31 +++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 076c9316c158..87ff9819f43f 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -8,6 +8,11 @@ capabilitiesSupport ? stdenv.hostPlatform.isLinux, libcap_ng, libxcrypt, + # Disable this by default because `mount` is setuid. However, we also support + # "dlopen" as a value here. Note that the nixpkgs setuid wrapper and ld-linux.so will filter out LD_LIBRARY_PATH + # if you set this to dlopen, so ensure you're accessing it without the wrapper if you depend on that. + cryptsetupSupport ? false, + cryptsetup, ncursesSupport ? true, ncurses, pamSupport ? true, @@ -24,9 +29,11 @@ gitUpdater, }: +let + isMinimal = cryptsetupSupport == false && !nlsSupport && !ncursesSupport && !systemdSupport; +in stdenv.mkDerivation rec { - pname = - "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; + pname = "util-linux" + lib.optionalString isMinimal "-minimal"; version = "2.40.4"; src = fetchurl { @@ -88,6 +95,14 @@ stdenv.mkDerivation rec { "--disable-su" # provided by shadow (lib.enableFeature writeSupport "write") (lib.enableFeature nlsSupport "nls") + (lib.withFeatureAs (cryptsetupSupport != false) "cryptsetup" ( + if cryptsetupSupport == true then + "yes" + else if cryptsetupSupport == "dlopen" then + "dlopen" + else + throw "invalid cryptsetupSupport value: ${toString cryptsetupSupport}" + )) (lib.withFeature ncursesSupport "ncursesw") (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") @@ -113,10 +128,13 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ - pkg-config - installShellFiles - ] ++ lib.optionals translateManpages [ po4a ]; + nativeBuildInputs = + [ + pkg-config + installShellFiles + ] + ++ lib.optionals translateManpages [ po4a ] + ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ]; buildInputs = [ @@ -124,6 +142,7 @@ stdenv.mkDerivation rec { libxcrypt sqlite ] + ++ lib.optionals (cryptsetupSupport == true) [ cryptsetup ] ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] ++ lib.optionals ncursesSupport [ ncurses ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 821599268c1e..7d8dbd1360f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12421,6 +12421,7 @@ with pkgs; usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; util-linuxMinimal = util-linux.override { + cryptsetupSupport = false; nlsSupport = false; ncursesSupport = false; pamSupport = false; From cdd88fefd4cc070f064e5794153981adfb3bbd99 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 1 Mar 2025 14:32:17 -0800 Subject: [PATCH 042/348] util-linux: adopt --- pkgs/by-name/ut/util-linux/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 87ff9819f43f..719547bc59f0 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -193,12 +193,12 @@ stdenv.mkDerivation rec { hasCol = stdenv.hostPlatform.libc == "glibc"; }; - meta = with lib; { + meta = { homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "Set of system utilities for Linux"; changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes"; # https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing - license = with licenses; [ + license = with lib.licenses; [ gpl2Only gpl2Plus gpl3Plus @@ -207,7 +207,8 @@ stdenv.mkDerivation rec { bsdOriginalUC publicDomain ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ numinit ]; + platforms = lib.platforms.unix; pkgConfigModules = [ "blkid" "fdisk" From d66c1888bb00dce7af9d022f4dbf57252f987745 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 22 Feb 2025 16:25:08 +0000 Subject: [PATCH 043/348] libnotify: 0.8.3 -> 0.8.4 Changes: https://gitlab.gnome.org/GNOME/libnotify/-/compare/0.8.3...0.8.4 --- pkgs/by-name/li/libnotify/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix index 655211524f7e..edd43c88da27 100644 --- a/pkgs/by-name/li/libnotify/package.nix +++ b/pkgs/by-name/li/libnotify/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.3"; + version = "0.8.4"; outputs = [ "out" @@ -29,9 +30,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-7o8++UYVatNAb99F/u29zZMtvSEatPFvdeuk82+y9sA="; + hash = "sha256-j6BNTr3BVbCiOd+IvZ8J6PJznVcHoTkLQnq0mF+D0lo="; }; + patches = [ + # Revert to avoid manpages breakage: + # https://gitlab.gnome.org/GNOME/libnotify/-/merge_requests/37#note_2366448 + (fetchpatch { + revert = true; + name = "unbreak-man.path"; + url = "https://gitlab.gnome.org/GNOME/libnotify/-/commit/2f99025b7ad54f29dc5236aa7dfcfa97d1c8efde.patch"; + hash = "sha256-/qbBs+bJjzCR2I7swy0RTsTaXap+gkYzvfchobeOzPQ="; + }) + ]; + mesonFlags = [ # disable tests as we don't need to depend on GTK (2/3) "-Dtests=false" From 65e87d455258705ff1541345c15cf99cea871429 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Mon, 3 Mar 2025 06:34:40 +0100 Subject: [PATCH 044/348] sbcl: 2.5.1 -> 2.5.2 --- pkgs/development/compilers/sbcl/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 88f7ea48fdc8..fec3603260ed 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -20,12 +20,12 @@ let }; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.5.0" = { - sha256 = "sha256-Lhiv0Ijkot8ht3uuLhcM5XDRHabSdgcpImXxzGqKGbE="; - }; "2.5.1" = { sha256 = "sha256-QTOzbNFtFNYzlpw3/VHCyJqOpdbhYRVSgZ2R9xshn4s="; }; + "2.5.2" = { + sha256 = "sha256-XcJ+un3aQz31P9dEHeixFHSoLNrBaJwfbOVfoGXWX6w="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb03e0e2cc58..49898f7d6c1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10991,17 +10991,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_5_0 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_5_1 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.5.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_5_1; + sbcl_2_5_2 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.2"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_5_2; sbclPackages = recurseIntoAttrs sbcl.pkgs; From 88f08b3566ec7269241f39d0fd1aa757b4718933 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 4 Mar 2025 06:23:43 +0000 Subject: [PATCH 045/348] netpbm: 11.9.2 -> 11.9.3 --- pkgs/tools/graphics/netpbm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 103690caf3aa..9454c6698b36 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.9.2"; + version = "11.9.3"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4998"; - sha256 = "sha256-lpPTvsRNsATmcg3eCGs9rqxeWw5CaNZP2DUU4yCOmyc="; + rev = "5027"; + sha256 = "sha256-fz4SvJwQAYV6agXC7oMwo8rUIHMRav25MuWiwoEONkE="; }; nativeBuildInputs = [ From 72edca1c2af9dce7fd552935fcd10946537926b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Mar 2025 07:23:45 +0000 Subject: [PATCH 046/348] hwdata: 0.392 -> 0.393 --- pkgs/by-name/hw/hwdata/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index fd1125591b87..6edf714d2919 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.392"; + version = "0.393"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-DjtPoPZZwFmVRZTOG4A+2KXI6zw68QEwq0iFRoV+5c4="; + hash = "sha256-RDp5NY9VYD0gylvzYpg9BytfRdQ6dim1jJtv32yeF3k="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; From 1e6177fb6a5de8e875562178c6d24ba9bf165217 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:11 +0100 Subject: [PATCH 047/348] borgmatic: migrate to pytest-cov-stub --- pkgs/by-name/bo/borgmatic/package.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index a6c95a39172d..ad3e358256f0 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { [ flexmock pytestCheckHook - pytest-cov + pytest-cov-stub ] ++ optional-dependencies.apprise; @@ -37,11 +37,6 @@ python3Packages.buildPythonApplication rec { "test_borgmatic_version_matches_news_version" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '--cov-fail-under=100' "" - ''; - nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = with python3Packages; [ From 951f6470b062aace496f7428967b1887cfe44709 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:11 +0100 Subject: [PATCH 048/348] python313Packages.adguardhome: migrate to pytest-cov-stub --- pkgs/development/python-modules/adguardhome/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 55d050b6ecaa..af0172724753 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, yarl, @@ -27,7 +28,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov" "" \ --replace-fail '"0.0.0"' '"${version}"' ''; @@ -43,6 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From f23eb90249860e1d28e605b9ace531864b364f5b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:12 +0100 Subject: [PATCH 049/348] python313Packages.aioconsole: migrate to pytest-cov-stub --- pkgs/development/python-modules/aioconsole/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index fd057e035489..d4a473ebeefe 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -32,13 +33,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail " --cov aioconsole --strict-markers --count 2 -vv" "" + --replace-fail " --strict-markers --count 2 -vv" "" ''; build-system = [ setuptools ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From edd64ce6233ee808e7b8b96e0f0cce8ca0ed40d3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:12 +0100 Subject: [PATCH 050/348] python313Packages.aiocron: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiocron/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index 0701fdab407a..a6a14212c761 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -7,6 +7,7 @@ croniter, tzlocal, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -28,11 +29,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub tzlocal ]; postPatch = '' - sed -i "/--cov/d" setup.cfg sed -i "/--ignore/d" setup.cfg ''; From ebb633f3cda9b6f221db98e52abcf0948fe6f243 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:12 +0100 Subject: [PATCH 051/348] python313Packages.aiohttp-jinja2: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiohttp-jinja2/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 080e154ef496..57af49298227 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -5,6 +5,7 @@ fetchPypi, jinja2, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -31,16 +32,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-aiohttp + pytest-cov-stub pytestCheckHook ]; __darwinAllowLocalNetworking = true; - postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail "--cov=aiohttp_jinja2/ --cov=tests/ --cov-report term" "" - ''; - pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" From 967c10e6cdefad8461f309b87533ae56df5ec4b0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:12 +0100 Subject: [PATCH 052/348] python313Packages.aiohue: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiohue/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 0cf7dcaa5b65..d2c0a0d7cf95 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -8,6 +8,7 @@ pytestCheckHook, pytest-aiohttp, pytest-asyncio, + pytest-cov-stub, pythonOlder, setuptools, }: @@ -28,8 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ - --replace-fail "--cov" "" + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; build-system = [ setuptools ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-aiohttp + pytest-cov-stub ]; pythonImportsCheck = [ From 66960c02b278fa951a40b9339756f76b27c46e8b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:12 +0100 Subject: [PATCH 053/348] python313Packages.aiokef: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiokef/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix index 52289adda842..ed6251b4ce04 100644 --- a/pkgs/development/python-modules/aiokef/default.nix +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pytest-cov-stub, pythonOlder, tenacity, }: @@ -23,7 +24,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tox.ini \ - --replace "--cov --cov-append --cov-fail-under=30 --cov-report=" "" \ --replace "--mypy" "" ''; @@ -32,7 +32,10 @@ buildPythonPackage rec { tenacity ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pytestFlagsArray = [ "tests" ]; pythonImportsCheck = [ "aiokef" ]; From 3d205ab256f27e077c36940783ba9b75d182cac2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:13 +0100 Subject: [PATCH 054/348] python313Packages.aiolimiter: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiolimiter/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix index 1603d1009da3..f6f5dfdc575b 100644 --- a/pkgs/development/python-modules/aiolimiter/default.nix +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -5,6 +5,7 @@ poetry-core, importlib-metadata, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, toml, @@ -30,15 +31,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook toml ]; - postPatch = '' - substituteInPlace tox.ini \ - --replace " --cov=aiolimiter --cov-config=tox.ini --cov-report term-missing" "" - ''; - pythonImportsCheck = [ "aiolimiter" ]; meta = with lib; { From 599e5f4b3fec203b445cf95b793213444ead3aff Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:13 +0100 Subject: [PATCH 055/348] python313Packages.aiopvpc: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiopvpc/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index ae8d7c7c72d8..0db3a0ba5c85 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -7,6 +7,7 @@ poetry-core, pytest-asyncio, pytest-timeout, + pytest-cov-stub, pytestCheckHook, pythonOlder, python-dotenv, @@ -26,11 +27,6 @@ buildPythonPackage rec { hash = "sha256-1xeXfhoXRfJ7vrpRPeYmwcAGjL09iNCOm/f4pPvuZLU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov --cov-report term --cov-report html" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -41,6 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-timeout + pytest-cov-stub pytestCheckHook python-dotenv ]; From 1d418c5c1e104361dfe49e68e77f76b11ed3ce36 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:13 +0100 Subject: [PATCH 056/348] python313Packages.aioshutil: migrate to pytest-cov-stub --- pkgs/development/python-modules/aioshutil/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index 44058048114f..9dda013dff72 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools-scm, @@ -22,15 +23,11 @@ buildPythonPackage rec { hash = "sha256-hSUNx43sIUPs4YfQ+H39FXTpj3oCMUqRzDdHX2OdRdE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail " --cov aioshutil --cov-report xml" "" - ''; - nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From 095379aee4c44463d2a1546ed5e654117c6a69c0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:13 +0100 Subject: [PATCH 057/348] python313Packages.aiosignal: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiosignal/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index cf74cfca0fb1..128e8c4f2d9b 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, frozenlist, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -26,13 +27,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ - --replace "filterwarnings = error" "" \ - --replace "--cov=aiosignal" "" + --replace "filterwarnings = error" "" ''; pythonImportsCheck = [ "aiosignal" ]; From 92478b0292b766fefc6a753ad97f943076c2d5f1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:14 +0100 Subject: [PATCH 058/348] python313Packages.aiosonic: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiosonic/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix index 739daea01132..29c7ad646fa3 100644 --- a/pkgs/development/python-modules/aiosonic/default.nix +++ b/pkgs/development/python-modules/aiosonic/default.nix @@ -18,6 +18,7 @@ proxy-py, pytest-aiohttp, pytest-asyncio, + pytest-cov-stub, pytest-django, pytest-mock, pytest-sugar, @@ -51,8 +52,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini --replace-fail \ - "addopts = --black --cov=aiosonic --cov-report term --cov-report html --doctest-modules" \ - "addopts = --doctest-modules" + "addopts = --black " \ + "addopts = " ''; build-system = [ poetry-core ]; @@ -74,6 +75,7 @@ buildPythonPackage rec { proxy-py pytest-aiohttp pytest-asyncio + pytest-cov-stub pytest-django pytest-mock pytest-sugar From 4c4dc5702f3fc8ec06fd1ae4a9866d98b69c14ad Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:14 +0100 Subject: [PATCH 059/348] python313Packages.aiosteamist: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiosteamist/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix index 3ab9437204ca..dc4e98180c40 100644 --- a/pkgs/development/python-modules/aiosteamist/default.nix +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, poetry-core, pytestCheckHook, + pytest-cov-stub, pythonOlder, xmltodict, }: @@ -23,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-e7Nt/o2A1qn2nSpWv6ZsZHn/WpcXKzol+f+JNJaSb4w="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=aiosteamist" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -37,6 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub ]; pythonImportsCheck = [ "aiosteamist" ]; From 8b332d6fd418ef14b36b21f2996d53782a76bf1b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:14 +0100 Subject: [PATCH 060/348] python313Packages.aioweenect: migrate to pytest-cov-stub --- pkgs/development/python-modules/aioweenect/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix index f1074a83ed59..dda6c9234ce4 100644 --- a/pkgs/development/python-modules/aioweenect/default.nix +++ b/pkgs/development/python-modules/aioweenect/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, hatchling, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -26,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov --cov-report term-missing --cov=src/aioweenect --asyncio-mode=auto" "" + --replace-fail "--asyncio-mode=auto" "" ''; pythonRelaxDeps = [ "aiohttp" ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From 4f8c27026fb99699abbe43d1967eab070a9c3c14 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:15 +0100 Subject: [PATCH 061/348] python313Packages.aiozoneinfo: migrate to pytest-cov-stub --- pkgs/development/python-modules/aiozoneinfo/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiozoneinfo/default.nix b/pkgs/development/python-modules/aiozoneinfo/default.nix index f0f0c22aa8b6..e177eb55607e 100644 --- a/pkgs/development/python-modules/aiozoneinfo/default.nix +++ b/pkgs/development/python-modules/aiozoneinfo/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, tzdata, @@ -23,17 +24,13 @@ buildPythonPackage rec { hash = "sha256-7qd6Yk/K4BLocu8eQK0hLaw2r1jhWIHBr9W4KsAvmx8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=aiozoneinfo --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ tzdata ]; nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From a9cda7f5e5b5d3ad54f9da2aa98ed9ce8052a971 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:15 +0100 Subject: [PATCH 062/348] python313Packages.async-modbus: migrate to pytest-cov-stub --- pkgs/development/python-modules/async-modbus/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index 7e2cf669e603..83efbef9a9cb 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -4,7 +4,7 @@ connio, fetchFromGitHub, fetchpatch, - pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -35,8 +35,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"--cov=async_modbus",' "" \ - --replace '"--cov-report=html", "--cov-report=term",' "" \ --replace '"--durations=2", "--verbose"' "" ''; @@ -48,7 +46,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From 9d9b7de1fc0a2b46f267453cf2ebac21c3c40ef8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:15 +0100 Subject: [PATCH 063/348] python313Packages.bitlist: migrate to pytest-cov-stub --- pkgs/development/python-modules/bitlist/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 76d2b45b2605..0744302e4af5 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -6,6 +6,7 @@ wheel, parts, pytestCheckHook, + pytest-cov-stub, pythonOlder, }: @@ -21,11 +22,6 @@ buildPythonPackage rec { hash = "sha256-+/rBno+OH7yEiN4K9VC6BCEPuOv8nNp0hU+fWegjqPw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '--cov=bitlist --cov-report term-missing' "" - ''; - build-system = [ setuptools wheel @@ -35,7 +31,10 @@ buildPythonPackage rec { dependencies = [ parts ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "bitlist" ]; From b3fc63ea3b0d32c9c2c8991760d3dec962fd0f0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Mar 2025 12:36:42 +0000 Subject: [PATCH 064/348] libcap: 2.73 -> 2.74 --- pkgs/by-name/li/libcap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index f648e896d262..498081caac2a 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -21,11 +21,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - hash = "sha256-ZAX2CJz0zdjCcVQM2ZBlTXjdCxmJstm9og+TOnWnlaU="; + hash = "sha256-64UnHyiTGIZEtkUc7Izpn0VBSY8W/5+Eh3wvyHJxdxQ="; }; outputs = [ "out" "dev" "lib" "man" "doc" ] From 40d793c8784d846ef81f8935209d3666144f38bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Mar 2025 12:38:33 +0000 Subject: [PATCH 065/348] faad2: 2.11.1 -> 2.11.2 --- pkgs/by-name/fa/faad2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/faad2/package.nix b/pkgs/by-name/fa/faad2/package.nix index 328e06960eb5..d4fa16c7f68c 100644 --- a/pkgs/by-name/fa/faad2/package.nix +++ b/pkgs/by-name/fa/faad2/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "faad2"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "knik0"; repo = "faad2"; rev = version; - hash = "sha256-E6oe7yjYy1SJo8xQkyUk1sSucKDMPxwUFVSAyrf4Pd8="; + hash = "sha256-JvmblrmE3doUMUwObBN2b+Ej+CDBWNemBsyYSCXGwo8="; }; outputs = [ From 2d3ce0de8979d55b447c8d455ccd7e6fe119ef5c Mon Sep 17 00:00:00 2001 From: misilelab Date: Mon, 3 Mar 2025 20:45:19 +0900 Subject: [PATCH 066/348] lvm2: 2.03.30 -> 2.03.31 Signed-off-by: misilelab --- pkgs/os-specific/linux/lvm2/2_03.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index d45fb41336ba..3e9e4fc5539b 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.30"; - hash = "sha256-rXar7LjciHcz4GxEnLmt0Eo1BvnweAwSiBem4aF87AU="; + version = "2.03.31"; + hash = "sha256-XbKVagD7+H2SJ0zMySQ2OH7Aw/qt7OdBPs4bocEMmP8="; } From 7f3f0fafcd7c065583e5b075cf0f00e04638d9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Wed, 5 Mar 2025 11:44:16 +0100 Subject: [PATCH 067/348] systemd: Enable systemd-firstboot Enable building the systemd-firstboot executable. Regarding the previous comment: > conflicts with the NixOS /etc management For conflicts to occur with /etc management, systemd-firstboot would have to be used. However activating the build flag only makes the executable available but it isn't used anywhere yet. --- pkgs/os-specific/linux/systemd/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4036c52d6eca..6faeb413173c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -108,8 +108,7 @@ withDocumentation ? true, withEfi ? stdenv.hostPlatform.isEfi, withFido2 ? true, - # conflicts with the NixOS /etc management - withFirstboot ? false, + withFirstboot ? true, withGcrypt ? true, withHomed ? !stdenv.hostPlatform.isMusl, withHostnamed ? true, From bdd609bfd319c01d518f1902eef74b9a30010334 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 21 Feb 2025 15:12:22 -0700 Subject: [PATCH 068/348] freebsd.libcam: init --- pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix new file mode 100644 index 000000000000..90341417d67f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix @@ -0,0 +1,16 @@ +{ + lib, + libsbuf, + mkDerivation, +}: +mkDerivation { + path = "lib/libcam"; + extraPaths = [ + "sys/cam" + ]; + buildInputs = [ + libsbuf + ]; + MK_TESTS = "no"; + meta.platforms = lib.platforms.freebsd; +} From 3d6f19095916a49a43adbad25e5d2fc7535f0d12 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 21 Feb 2025 15:38:49 -0700 Subject: [PATCH 069/348] cdparanoia: fix build on FreeBSD --- .../applications/audio/cdparanoia/default.nix | 90 ++++++++++++++++++- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index e3760c9e2012..b0c143d21537 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -5,6 +5,7 @@ fetchpatch, updateAutotoolsGnuConfigScriptsHook, autoreconfHook, + freebsd, }: stdenv.mkDerivation rec { @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { }) ] ++ [ - # Has to come after darwin patches + # Has to come after darwin patches and before freebsd patches ./fix_private_keyword.patch # Order does not matter ./configure.patch @@ -62,13 +63,98 @@ stdenv.mkDerivation rec { hash = "sha256-krfprwls0L3hsNfoj2j69J5k1RTKEQtzE0fLYG9EJKo="; }) ] - ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; + ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch + ++ [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h"; + hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scan__devices.c"; + hash = "sha256-UD7SXeypF3bAqT7Y24UOrGZNaD8ZmpS2V7XQU+3VKXk="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cdda__interface.h"; + hash = "sha256-JL4qe4LwmNp2jQFqTvyRjc6bixGqYr6BZmqsYIY9xhw="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_common__interface.c"; + hash = "sha256-vw0oFM6w15YBaAK01FwVcSN+oztSfo5jL6OlGy0iWBg="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_cooked__interface.c"; + hash = "sha256-g39dhxb8+K9BIb2/5cmkQ9GYjg4gDjj6sv+dXx93kQ4="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_interface.c"; + hash = "sha256-LMWfbqLjbQM3L4H3orAxyyAHf1hVtFwfmZY8NmBLKzs="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_scsi__interface.c"; + hash = "sha256-dx6YCWW8J0e455phaYDUMiOCvp4DsfINjSEiEfnHaNI="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/private_data/g' $out + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-Makefile.in"; + hash = "sha256-Wje2d58xrSWHJNktQRHcNSbh5yh6vMtpgc/3G4D1vrI="; + extraPrefix = ""; + postFetch = '' + sed -E -i -e 's/\/__linux__/g' $out + ''; + }) + ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook autoreconfHook ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isFreeBSD [ + # cdparanoia shipped headers have #include + # (it is part of the freebsd base system so this is reasonable + # but we want to keep the default freebsd libs, freebsd.libc, small) + freebsd.libcam + ]; + + env = + lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + NIX_LDFLAGS = "-lcam"; + } + // { + BSD_INSTALL_PROGRAM = "install"; + BSD_INSTALL_LIB = "install"; + }; + # Build system reuses the same object file names for shared and static # library. Occasionally fails in the middle: # gcc -O2 -fsigned-char -g -O2 -c scan_devices.c From 11008209788e4f139566b3153cee1781751f7126 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Wed, 5 Mar 2025 19:49:49 +0000 Subject: [PATCH 070/348] unixtools: hexdump util-linux -> util-linuxMinimal Linux depends on util-linux, and util-linux depends on systemd, which means when systemd is changed linux is rebuilt unnecessarily, this fixes this. --- pkgs/top-level/unixtools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index b5c34fe6ba07..7e2e97200d93 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -107,7 +107,7 @@ let darwin = pkgs.darwin.diskdev_cmds; }; hexdump = { - linux = pkgs.util-linux; + linux = pkgs.util-linuxMinimal; darwin = pkgs.darwin.shell_cmds; }; hostname = { From 4dc2c45a86c9016e5fbb97a2fdf7e1a456a88d41 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 23 Feb 2025 02:14:27 -0700 Subject: [PATCH 071/348] lerc: fix build on FreeBSD --- pkgs/by-name/le/lerc/package.nix | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/le/lerc/package.nix b/pkgs/by-name/le/lerc/package.nix index 08a7cb63afbf..1443ce855449 100644 --- a/pkgs/by-name/le/lerc/package.nix +++ b/pkgs/by-name/le/lerc/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + buildPackages, fetchFromGitHub, fetchpatch, cmake, @@ -23,14 +24,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; }; - patches = [ - # https://github.com/Esri/lerc/pull/227 - (fetchpatch { - name = "use-cmake-install-full-dir.patch"; - url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; - hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; - }) - ]; + # Required to get the freebsd-ports patch to apply. + # There seem to be inconsistent line endings in this project - just converting the patch doesn't work + prePatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + ${buildPackages.dos2unix}/bin/dos2unix src/LercLib/fpl_EsriHuffman.cpp src/LercLib/fpl_Lerc2Ext.cpp + ''; + + patches = + [ + # https://github.com/Esri/lerc/pull/227 + (fetchpatch { + name = "use-cmake-install-full-dir.patch"; + url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch"; + hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk="; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ee9e39ceb1af729ac33854b5f3de652cb5ce0eca/graphics/lerc/files/patch-_assert"; + hash = "sha256-agvGqgIsKS8v43UZdTVxDRDGbZdj2+AzKoQONvQumB4="; + extraPrefix = ""; + }) + ]; nativeBuildInputs = [ cmake From 3703e38135d9920a0b60b56cc1ee8288a9058ed9 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sun, 9 Feb 2025 12:44:31 -0500 Subject: [PATCH 072/348] noBrokenSymlinks: check for unreadable symlinks Resolves #380681. --- .../setup-hooks/no-broken-symlinks.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index e2694c2b7bde..c51e4ae22ce2 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -13,7 +13,8 @@ postFixupHooks+=(noBrokenSymlinksInAllOutputs) # A symlink is "dangling" if it points to a non-existent target. # A symlink is "reflexive" if it points to itself. -# A symlink is considered "broken" if it is either dangling or reflexive. +# A symlink is "unreadable" if the readlink command fails, e.g. because of permission errors. +# A symlink is considered "broken" if it is either dangling, reflexive or unreadable. noBrokenSymlinks() { local -r output="${1:?}" local path @@ -21,6 +22,7 @@ noBrokenSymlinks() { local symlinkTarget local -i numDanglingSymlinks=0 local -i numReflexiveSymlinks=0 + local -i numUnreadableSymlinks=0 # NOTE(@connorbaker): This hook doesn't check for cycles in symlinks. @@ -33,7 +35,11 @@ noBrokenSymlinks() { # NOTE: path is absolute because we're running `find` against an absolute path (`output`). while IFS= read -r -d $'\0' path; do pathParent="$(dirname "$path")" - symlinkTarget="$(readlink "$path")" + if ! symlinkTarget="$(readlink "$path")"; then + nixErrorLog "the symlink $path is unreadable" + numUnreadableSymlinks+=1 + continue + fi # Canonicalize symlinkTarget to an absolute path. if [[ $symlinkTarget == /* ]]; then @@ -61,8 +67,8 @@ noBrokenSymlinks() { fi done < <(find "$output" -type l -print0) - if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0)); then - nixErrorLog "found $numDanglingSymlinks dangling symlinks and $numReflexiveSymlinks reflexive symlinks" + if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0 || numUnreadableSymlinks > 0)); then + nixErrorLog "found $numDanglingSymlinks dangling symlinks, $numReflexiveSymlinks reflexive symlinks and $numUnreadableSymlinks unreadable symlinks" exit 1 fi return 0 From 693c7b3dadebbbb92c37b26ab13cccef8aad843a Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Fri, 21 Feb 2025 16:26:31 -0500 Subject: [PATCH 073/348] noBrokenSymlinks: add test for unreadable symlinks; fix existing tests --- pkgs/test/stdenv/no-broken-symlinks.nix | 76 +++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 9c8ea72a2c7d..88777008c5cc 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -17,6 +17,20 @@ let ln -s${optionalString (!absolute) "r"} "$out/reflexive-symlink" "$out/reflexive-symlink" ''; + # Some platforms implement permissions for symlinks, while others - including + # Linux - ignore them. This function takes an extra argument specifying + # whether a failure to make the symlink unreadable should count as a 'fail' or + # 'pass', to make sure the tests work properly for both kinds of platform. + mkUnreadableSymlink = absolute: failIfUnsupported: '' + touch "$out/unreadable-symlink-target" + ln -s${optionalString (!absolute) "r"} "$out/unreadable-symlink-target" "$out/unreadable-symlink" + chmod -h ugo-rwx "$out/unreadable-symlink" + if readlink "$out/unreadable-symlink" >/dev/null 2>&1; then + nixErrorLog "symlink permissions not supported" + ${optionalString failIfUnsupported "exit 1"} + fi + ''; + mkValidSymlink = absolute: '' touch "$out/valid" ln -s${optionalString (!absolute) "r"} "$out/valid" "$out/valid-symlink" @@ -61,7 +75,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -81,7 +95,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -101,7 +115,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -121,7 +135,7 @@ in } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -131,6 +145,46 @@ in derivationArgs.dontCheckForBrokenSymlinks = true; }; + fail-unreadable-symlink-relative = + runCommand "fail-unreadable-symlink-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-relative-inner"; + commands = [ (mkUnreadableSymlink false true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -E 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks|symlink permissions not supported' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-unreadable-symlink-relative-allowed = testBuilder { + name = "pass-unreadable-symlink-relative-allowed"; + commands = [ (mkUnreadableSymlink false false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-unreadable-symlink-absolute = + runCommand "fail-unreadable-symlink-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-absolute-inner"; + commands = [ (mkUnreadableSymlink true true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -E 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks|symlink permissions not supported' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-unreadable-symlink-absolute-allowed = testBuilder { + name = "pass-unreadable-symlink-absolute-allowed"; + commands = [ (mkUnreadableSymlink true false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + fail-broken-symlinks-relative = runCommand "fail-broken-symlinks-relative" { @@ -139,12 +193,16 @@ in commands = [ (mkDanglingSymlink false) (mkReflexiveSymlink false) + (mkUnreadableSymlink false true) ]; }); } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi touch $out ''; @@ -153,6 +211,7 @@ in commands = [ (mkDanglingSymlink false) (mkReflexiveSymlink false) + (mkUnreadableSymlink false false) ]; derivationArgs.dontCheckForBrokenSymlinks = true; }; @@ -165,12 +224,16 @@ in commands = [ (mkDanglingSymlink true) (mkReflexiveSymlink true) + (mkUnreadableSymlink true true) ]; }); } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi touch $out ''; @@ -179,6 +242,7 @@ in commands = [ (mkDanglingSymlink true) (mkReflexiveSymlink true) + (mkUnreadableSymlink true false) ]; derivationArgs.dontCheckForBrokenSymlinks = true; }; From 1a9fd7866b789ef99e4f4ac353e4da6bfe740aa3 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sat, 22 Feb 2025 15:15:13 -0500 Subject: [PATCH 074/348] noBrokenSymlinks: use umask instead of chmod to make unreadable symlinks The stage2 stdenv uses Coreutils 9.4, which doesn't have `chmod -h` yet. --- pkgs/test/stdenv/no-broken-symlinks.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 88777008c5cc..344f8b5afc1d 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -23,8 +23,10 @@ let # 'pass', to make sure the tests work properly for both kinds of platform. mkUnreadableSymlink = absolute: failIfUnsupported: '' touch "$out/unreadable-symlink-target" - ln -s${optionalString (!absolute) "r"} "$out/unreadable-symlink-target" "$out/unreadable-symlink" - chmod -h ugo-rwx "$out/unreadable-symlink" + ( + umask 777 + ln -s${optionalString (!absolute) "r"} "$out/unreadable-symlink-target" "$out/unreadable-symlink" + ) if readlink "$out/unreadable-symlink" >/dev/null 2>&1; then nixErrorLog "symlink permissions not supported" ${optionalString failIfUnsupported "exit 1"} From 43178a462f0fe723c1d7b074abc8e63820b6fde0 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Sat, 22 Feb 2025 20:09:28 -0500 Subject: [PATCH 075/348] noBrokenSymlinks: fix tests on Linux `mkUnreadableSymlink` was exiting before the hook could print its messages, meaning that the combined 'broken' test wasn't getting the symlink counts. --- pkgs/test/stdenv/no-broken-symlinks.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 344f8b5afc1d..5ef7a75e7774 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -29,7 +29,10 @@ let ) if readlink "$out/unreadable-symlink" >/dev/null 2>&1; then nixErrorLog "symlink permissions not supported" - ${optionalString failIfUnsupported "exit 1"} + ${optionalString failIfUnsupported + # Postpone the failure until after no-broken-symlinks.sh has a chance to print its messages + "postFixupHooks+=('exit 1')" + } fi ''; From 0c4f6e939d0ac1502600f94e8a5cc9531c06f82f Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Mon, 24 Feb 2025 21:05:10 -0500 Subject: [PATCH 076/348] noBrokenSymlinks: move hook to beginning of `defaultNativeBuildInputs` This protects the rest of the standard setup hooks from unreadable and other broken symlinks. (Otherwise, they can choke on the `readlink` step and fail silently before `no-broken-symlinks.sh`` is even reached.) --- pkgs/stdenv/generic/default.nix | 2 +- pkgs/test/stdenv/hooks.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 57a58eb2ebe4..4bb5be6021f7 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -69,6 +69,7 @@ let defaultNativeBuildInputs = extraNativeBuildInputs ++ [ + ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/audit-tmpdir.sh ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/make-symlinks-relative.sh @@ -77,7 +78,6 @@ let ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-systemd-user-units.sh ../../build-support/setup-hooks/multiple-outputs.sh - ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 83e82b77b24b..b90b60780b86 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -7,6 +7,7 @@ # ordering should match defaultNativeBuildInputs { + no-broken-symlinks = import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; }; # TODO: add audit-tmpdir compress-man-pages = let @@ -97,7 +98,6 @@ [[ -e $out/bin/foo ]] ''; }; - no-broken-symlinks = import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; }; # TODO: add multiple-outputs patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; }; prune-libtool-files = From 18d92cd065269c5a470662850ce034b068292610 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:53:29 -0500 Subject: [PATCH 077/348] noBrokenSymlinks: set `meta.badPlatforms` for tests Some platforms implement permissions for symlinks, while others - including Linux - ignore them. As a result, testing this hook's handling of unreadable symlinks requires careful attention to which kind of platform we're on. See the comments by `meta.badPlatforms` for details. --- pkgs/test/stdenv/no-broken-symlinks.nix | 136 +++++++++++++++++++----- 1 file changed, 107 insertions(+), 29 deletions(-) diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index 5ef7a75e7774..b50034b78b71 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -17,23 +17,17 @@ let ln -s${optionalString (!absolute) "r"} "$out/reflexive-symlink" "$out/reflexive-symlink" ''; - # Some platforms implement permissions for symlinks, while others - including - # Linux - ignore them. This function takes an extra argument specifying - # whether a failure to make the symlink unreadable should count as a 'fail' or - # 'pass', to make sure the tests work properly for both kinds of platform. - mkUnreadableSymlink = absolute: failIfUnsupported: '' + # Some platforms implement permissions for symlinks, while others - including Linux - ignore them. + # As a result, testing this hook's handling of unreadable symlinks requires careful attention to + # which kind of platform we're on. See the comments by `meta.badPlatforms` below for details. + platformsWithSymlinkPermissions = with lib.platforms; darwin ++ freebsd ++ netbsd ++ openbsd; + platformsWithoutSymlinkPermissions = lib.subtractLists platformsWithSymlinkPermissions lib.platforms.all; + mkUnreadableSymlink = absolute: '' touch "$out/unreadable-symlink-target" ( umask 777 ln -s${optionalString (!absolute) "r"} "$out/unreadable-symlink-target" "$out/unreadable-symlink" ) - if readlink "$out/unreadable-symlink" >/dev/null 2>&1; then - nixErrorLog "symlink permissions not supported" - ${optionalString failIfUnsupported - # Postpone the failure until after no-broken-symlinks.sh has a chance to print its messages - "postFixupHooks+=('exit 1')" - } - fi ''; mkValidSymlink = absolute: '' @@ -50,10 +44,11 @@ let name, commands ? [ ], derivationArgs ? { }, + meta ? { }, }: stdenv.mkDerivation ( { - inherit name; + inherit name meta; strictDeps = true; dontUnpack = true; dontPatch = true; @@ -155,19 +150,26 @@ in { failed = testBuildFailure (testBuilder { name = "fail-unreadable-symlink-relative-inner"; - commands = [ (mkUnreadableSymlink false true) ]; + commands = [ (mkUnreadableSymlink false) ]; }); + + # Skip test if symlink permissions are not supported, since the hook won't have anything to report. + meta.badPlatforms = platformsWithoutSymlinkPermissions; } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -E 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks|symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; pass-unreadable-symlink-relative-allowed = testBuilder { name = "pass-unreadable-symlink-relative-allowed"; - commands = [ (mkUnreadableSymlink false false) ]; + commands = [ (mkUnreadableSymlink false) ]; derivationArgs.dontCheckForBrokenSymlinks = true; + + # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. + # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. + meta.badPlatforms = platformsWithSymlinkPermissions; }; fail-unreadable-symlink-absolute = @@ -175,21 +177,29 @@ in { failed = testBuildFailure (testBuilder { name = "fail-unreadable-symlink-absolute-inner"; - commands = [ (mkUnreadableSymlink true true) ]; + commands = [ (mkUnreadableSymlink true) ]; }); + + # Skip test if symlink permissions are not supported, since the hook won't have anything to report. + meta.badPlatforms = platformsWithoutSymlinkPermissions; } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -E 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks|symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; pass-unreadable-symlink-absolute-allowed = testBuilder { name = "pass-unreadable-symlink-absolute-allowed"; - commands = [ (mkUnreadableSymlink true false) ]; + commands = [ (mkUnreadableSymlink true) ]; derivationArgs.dontCheckForBrokenSymlinks = true; + + # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. + # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. + meta.badPlatforms = platformsWithSymlinkPermissions; }; + # Leave the unreadable symlink out of the combined 'broken' test since it doesn't work on all platforms. fail-broken-symlinks-relative = runCommand "fail-broken-symlinks-relative" { @@ -198,16 +208,12 @@ in commands = [ (mkDanglingSymlink false) (mkReflexiveSymlink false) - (mkUnreadableSymlink false true) ]; }); } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then - grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" - grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" - fi + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" touch $out ''; @@ -216,7 +222,6 @@ in commands = [ (mkDanglingSymlink false) (mkReflexiveSymlink false) - (mkUnreadableSymlink false false) ]; derivationArgs.dontCheckForBrokenSymlinks = true; }; @@ -229,10 +234,41 @@ in commands = [ (mkDanglingSymlink true) (mkReflexiveSymlink true) - (mkUnreadableSymlink true true) ]; }); } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-broken-symlinks-absolute-allowed = testBuilder { + name = "pass-broken-symlinks-absolute-allowed"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + # The `all-broken` tests include unreadable symlinks along with the other kinds of broken links. + # They should be run/skipped on the same sets platforms as the corresponding `unreadable` tests. + fail-all-broken-symlinks-relative = + runCommand "fail-all-broken-symlinks-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-relative-inner"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + }); + + # Skip test if symlink permissions are not supported, since the hook won't have anything to report. + meta.badPlatforms = platformsWithoutSymlinkPermissions; + } '' (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then @@ -242,14 +278,56 @@ in touch $out ''; - pass-broken-symlinks-absolute-allowed = testBuilder { - name = "pass-broken-symlinks-absolute-allowed"; + pass-all-broken-symlinks-relative-allowed = testBuilder { + name = "pass-all-broken-symlinks-relative-allowed"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + + # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. + # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. + meta.badPlatforms = platformsWithSymlinkPermissions; + }; + + fail-all-broken-symlinks-absolute = + runCommand "fail-all-broken-symlinks-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-absolute-inner"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + (mkUnreadableSymlink true) + ]; + }); + + # Skip test if symlink permissions are not supported, since the hook won't have anything to report. + meta.badPlatforms = platformsWithoutSymlinkPermissions; + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi + touch $out + ''; + + pass-all-broken-symlinks-absolute-allowed = testBuilder { + name = "pass-all-broken-symlinks-absolute-allowed"; commands = [ (mkDanglingSymlink true) (mkReflexiveSymlink true) - (mkUnreadableSymlink true false) + (mkUnreadableSymlink true) ]; derivationArgs.dontCheckForBrokenSymlinks = true; + + # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. + # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. + meta.badPlatforms = platformsWithSymlinkPermissions; }; pass-valid-symlink-relative = testBuilder { From 0354b63bf9325b0deadba0c1f5cfdf80da88e624 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Wed, 5 Mar 2025 15:41:16 -0500 Subject: [PATCH 078/348] noBrokenSymlinks: use `lib.optionalAttrs` instead of `meta.badPlatforms` Having unbuildable tests in the attrset makes it difficult to ask Nix to build all the working ones at once. See discussion in #380683. So instead of flagging them, let's just remove them entirely. --- pkgs/test/stdenv/no-broken-symlinks.nix | 246 +++++++++++------------- 1 file changed, 112 insertions(+), 134 deletions(-) diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix index b50034b78b71..af23373c5630 100644 --- a/pkgs/test/stdenv/no-broken-symlinks.nix +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -19,9 +19,8 @@ let # Some platforms implement permissions for symlinks, while others - including Linux - ignore them. # As a result, testing this hook's handling of unreadable symlinks requires careful attention to - # which kind of platform we're on. See the comments by `meta.badPlatforms` below for details. - platformsWithSymlinkPermissions = with lib.platforms; darwin ++ freebsd ++ netbsd ++ openbsd; - platformsWithoutSymlinkPermissions = lib.subtractLists platformsWithSymlinkPermissions lib.platforms.all; + # which kind of platform we're on. See the comments by `lib.optionalAttrs` below for details. + hasSymlinkPermissions = with stdenv.hostPlatform; isDarwin || isBSD; mkUnreadableSymlink = absolute: '' touch "$out/unreadable-symlink-target" ( @@ -44,11 +43,10 @@ let name, commands ? [ ], derivationArgs ? { }, - meta ? { }, }: stdenv.mkDerivation ( { - inherit name meta; + inherit name; strictDeps = true; dontUnpack = true; dontPatch = true; @@ -145,60 +143,6 @@ in derivationArgs.dontCheckForBrokenSymlinks = true; }; - fail-unreadable-symlink-relative = - runCommand "fail-unreadable-symlink-relative" - { - failed = testBuildFailure (testBuilder { - name = "fail-unreadable-symlink-relative-inner"; - commands = [ (mkUnreadableSymlink false) ]; - }); - - # Skip test if symlink permissions are not supported, since the hook won't have anything to report. - meta.badPlatforms = platformsWithoutSymlinkPermissions; - } - '' - (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" - touch $out - ''; - - pass-unreadable-symlink-relative-allowed = testBuilder { - name = "pass-unreadable-symlink-relative-allowed"; - commands = [ (mkUnreadableSymlink false) ]; - derivationArgs.dontCheckForBrokenSymlinks = true; - - # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. - # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. - meta.badPlatforms = platformsWithSymlinkPermissions; - }; - - fail-unreadable-symlink-absolute = - runCommand "fail-unreadable-symlink-absolute" - { - failed = testBuildFailure (testBuilder { - name = "fail-unreadable-symlink-absolute-inner"; - commands = [ (mkUnreadableSymlink true) ]; - }); - - # Skip test if symlink permissions are not supported, since the hook won't have anything to report. - meta.badPlatforms = platformsWithoutSymlinkPermissions; - } - '' - (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" - touch $out - ''; - - pass-unreadable-symlink-absolute-allowed = testBuilder { - name = "pass-unreadable-symlink-absolute-allowed"; - commands = [ (mkUnreadableSymlink true) ]; - derivationArgs.dontCheckForBrokenSymlinks = true; - - # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. - # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. - meta.badPlatforms = platformsWithSymlinkPermissions; - }; - # Leave the unreadable symlink out of the combined 'broken' test since it doesn't work on all platforms. fail-broken-symlinks-relative = runCommand "fail-broken-symlinks-relative" @@ -254,81 +198,7 @@ in # The `all-broken` tests include unreadable symlinks along with the other kinds of broken links. # They should be run/skipped on the same sets platforms as the corresponding `unreadable` tests. - fail-all-broken-symlinks-relative = - runCommand "fail-all-broken-symlinks-relative" - { - failed = testBuildFailure (testBuilder { - name = "fail-all-broken-symlinks-relative-inner"; - commands = [ - (mkDanglingSymlink false) - (mkReflexiveSymlink false) - (mkUnreadableSymlink false) - ]; - }); - - # Skip test if symlink permissions are not supported, since the hook won't have anything to report. - meta.badPlatforms = platformsWithoutSymlinkPermissions; - } - '' - (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then - grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" - grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" - fi - touch $out - ''; - - pass-all-broken-symlinks-relative-allowed = testBuilder { - name = "pass-all-broken-symlinks-relative-allowed"; - commands = [ - (mkDanglingSymlink false) - (mkReflexiveSymlink false) - (mkUnreadableSymlink false) - ]; - derivationArgs.dontCheckForBrokenSymlinks = true; - - # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. - # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. - meta.badPlatforms = platformsWithSymlinkPermissions; - }; - - fail-all-broken-symlinks-absolute = - runCommand "fail-all-broken-symlinks-absolute" - { - failed = testBuildFailure (testBuilder { - name = "fail-all-broken-symlinks-absolute-inner"; - commands = [ - (mkDanglingSymlink true) - (mkReflexiveSymlink true) - (mkUnreadableSymlink true) - ]; - }); - - # Skip test if symlink permissions are not supported, since the hook won't have anything to report. - meta.badPlatforms = platformsWithoutSymlinkPermissions; - } - '' - (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) - if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then - grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" - grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" - fi - touch $out - ''; - - pass-all-broken-symlinks-absolute-allowed = testBuilder { - name = "pass-all-broken-symlinks-absolute-allowed"; - commands = [ - (mkDanglingSymlink true) - (mkReflexiveSymlink true) - (mkUnreadableSymlink true) - ]; - derivationArgs.dontCheckForBrokenSymlinks = true; - - # This test will break on platforms that use symlink permissions, because even though this hook will be okay, later ones will error out. - # It should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. - meta.badPlatforms = platformsWithSymlinkPermissions; - }; + # See below. pass-valid-symlink-relative = testBuilder { name = "pass-valid-symlink-relative"; @@ -350,3 +220,111 @@ in commands = [ (mkValidSymlinkOutsideNixStore true) ]; }; } +# Skip these tests if symlink permissions are not supported, since the hook won't have anything to report. +// lib.optionalAttrs hasSymlinkPermissions { + fail-unreadable-symlink-relative = + runCommand "fail-unreadable-symlink-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-relative-inner"; + commands = [ (mkUnreadableSymlink false) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + fail-unreadable-symlink-absolute = + runCommand "fail-unreadable-symlink-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-unreadable-symlink-absolute-inner"; + commands = [ (mkUnreadableSymlink true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks, 0 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + fail-all-broken-symlinks-relative = + runCommand "fail-all-broken-symlinks-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-relative-inner"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi + touch $out + ''; + + fail-all-broken-symlinks-absolute = + runCommand "fail-all-broken-symlinks-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-all-broken-symlinks-absolute-inner"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + (mkUnreadableSymlink true) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + if ! grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 1 unreadable symlinks' "$failed/testBuildFailure.log"; then + grep -F 'symlink permissions not supported' "$failed/testBuildFailure.log" + grep -F 'found 1 dangling symlinks, 1 reflexive symlinks and 0 unreadable symlinks' "$failed/testBuildFailure.log" + fi + touch $out + ''; + +} +# These tests will break on platforms that do use symlink permissions, because even though this hook will be okay, later ones will error out. +# They should be safe to run on other platforms, just to make sure the hook isn't completely broken. It won't have anything to report, though. +// lib.optionalAttrs (!hasSymlinkPermissions) { + pass-unreadable-symlink-relative-allowed = testBuilder { + name = "pass-unreadable-symlink-relative-allowed"; + commands = [ (mkUnreadableSymlink false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-unreadable-symlink-absolute-allowed = testBuilder { + name = "pass-unreadable-symlink-absolute-allowed"; + commands = [ (mkUnreadableSymlink true) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-all-broken-symlinks-relative-allowed = testBuilder { + name = "pass-all-broken-symlinks-relative-allowed"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + (mkUnreadableSymlink false) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-all-broken-symlinks-absolute-allowed = testBuilder { + name = "pass-all-broken-symlinks-absolute-allowed"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + (mkUnreadableSymlink true) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; +} From 0f1794375126c36acf1cf3dfeb119b5b2b0bb7f6 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Wed, 5 Mar 2025 15:43:55 -0500 Subject: [PATCH 079/348] noBrokenSymlinks: apply `lib.recurseIntoAttrs` to set of tests For consistency with the outer `tests.stdenv.hooks` attrset. --- pkgs/test/stdenv/hooks.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index b90b60780b86..aa138040d50f 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -7,7 +7,9 @@ # ordering should match defaultNativeBuildInputs { - no-broken-symlinks = import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; }; + no-broken-symlinks = lib.recurseIntoAttrs ( + import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; } + ); # TODO: add audit-tmpdir compress-man-pages = let From 6d5b2734cf3a18388901f73b2127282349541760 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 5 Mar 2025 22:29:27 +0000 Subject: [PATCH 080/348] SDL2: 2.32.0 -> 2.32.2 Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.32.2 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d88431bca7df..2220dc82b16b 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.32.0"; + version = "2.32.2"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-BdyMlttrDwQMoz+bO6bfU3bh0xKnT8yQF6nb6OGRbHw="; + hash = "sha256-Gtg8G1tRouGZbes1KhsXpYbItpNHYqJCiQKW/L77b+U="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ From 040f9379f59d12433edd67994a0c94777671f39a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Mar 2025 02:13:16 +0000 Subject: [PATCH 081/348] libsepol: 3.8 -> 3.8.1 --- pkgs/by-name/li/libsepol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index 09feeb1e2fdf..ea4a5e45838a 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "3.8"; + version = "3.8.1"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${se_url}/${version}/libsepol-${version}.tar.gz"; - sha256 = "sha256-hE+9vwIzS5zgODOtimcQU/Z7QHbXLbTwPg7iZl7C61U="; + sha256 = "sha256-DnhwUwX5VavUwGVNN6VHfuJjSat0254rA6eGiJeuHd8="; }; postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' From 16a4d9cc0f471877480062b7384c744b0e8d83c3 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 5 Mar 2025 23:08:25 -0700 Subject: [PATCH 082/348] cfitsio: fix cross build for FreeBSD --- pkgs/by-name/cf/cfitsio/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix index 3cc37833a80b..d2b6324d92c4 100644 --- a/pkgs/by-name/cf/cfitsio/package.nix +++ b/pkgs/by-name/cf/cfitsio/package.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation (finalAttrs: { "--enable-reentrant" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + # concerning. upstream defines XOPEN_SOURCE=700 which makes FreeBSD very insistent on + # not showing us gethostbyname() + NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1"; + }; + hardeningDisable = [ "format" ]; # Shared-only build @@ -58,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { xbreak hjones2199 ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = lib.platforms.unix; }; }) From 4add78fa5024be0495bfbfab6979096acdad9630 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 5 Mar 2025 23:51:10 -0700 Subject: [PATCH 083/348] libraw: Fix build for FreeBSD Prior art: https://github.com/freebsd/freebsd-ports/blob/213e698d9e1a97b532a69af3e27d8b1380149186/graphics/libraw/Makefile#L49 --- pkgs/by-name/li/libraw/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix index 700092119a7e..b16a69fea358 100644 --- a/pkgs/by-name/li/libraw/package.nix +++ b/pkgs/by-name/li/libraw/package.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace libraw*.pc.in --replace-fail -lstdc++ "" + ''; + passthru.tests = { inherit imagemagick hdrmerge freeimage; inherit (python3.pkgs) rawkit; From cc5629f83e17c6c1846d252d80ce9790c9690ecc Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 6 Mar 2025 00:00:19 -0700 Subject: [PATCH 084/348] libvmaf: Fix build for FreeBSD --- pkgs/by-name/li/libvmaf/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/li/libvmaf/package.nix b/pkgs/by-name/li/libvmaf/package.nix index 00ee04515b5c..eea42c1c5730 100644 --- a/pkgs/by-name/li/libvmaf/package.nix +++ b/pkgs/by-name/li/libvmaf/package.nix @@ -31,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: { xxd ]; + postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + substituteInPlace meson.build --replace-fail '_XOPEN_SOURCE=600' '_XOPEN_SOURCE=700' + ''; + + env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { + NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1"; + }; + mesonFlags = [ "-Denable_avx512=true" ]; outputs = [ From 6c9e33016810d7c8bd291d393b147a8a3c213f5c Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 6 Mar 2025 11:21:24 +0100 Subject: [PATCH 085/348] setools: refactor --- pkgs/by-name/se/setools/package.nix | 45 ++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/se/setools/package.nix b/pkgs/by-name/se/setools/package.nix index 47cd6fcbcc19..d00a1b9789f9 100644 --- a/pkgs/by-name/se/setools/package.nix +++ b/pkgs/by-name/se/setools/package.nix @@ -1,16 +1,17 @@ { lib, fetchFromGitHub, - python3, + python3Packages, libsepol, libselinux, checkpolicy, withGraphics ? false, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "setools"; version = "4.5.1"; + pyproject = true; src = fetchFromGitHub { owner = "SELinuxProject"; @@ -19,25 +20,32 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-/6dOzSz2Do4d6TSS50fuak0CysoQ532zJ0bJ532BUCE="; }; - nativeBuildInputs = [ python3.pkgs.cython ]; + build-system = with python3Packages; [ + cython + setuptools + ]; + buildInputs = [ libsepol ]; - propagatedBuildInputs = - with python3.pkgs; + + dependencies = + with python3Packages; [ - enum34 libselinux - networkx setuptools ] ++ lib.optionals withGraphics [ pyqt5 ]; + optional-dependencies = { + analysis = with python3Packages; [ + networkx + pygraphviz + ]; + }; + nativeCheckInputs = [ - python3.pkgs.tox + python3Packages.tox checkpolicy ]; - preCheck = '' - export CHECKPOLICY=${checkpolicy}/bin/checkpolicy - ''; setupPyBuildFlags = [ "-i" ]; @@ -45,10 +53,19 @@ python3.pkgs.buildPythonApplication rec { export SEPOL="${lib.getLib libsepol}/lib/libsepol.a" ''; - meta = with lib; { + preCheck = '' + export CHECKPOLICY=${lib.getExe checkpolicy} + ''; + + meta = { description = "SELinux Policy Analysis Tools"; homepage = "https://github.com/SELinuxProject/setools"; - license = licenses.gpl2Only; - platforms = platforms.linux; + changelog = "https://github.com/SELinuxProject/setools/blob/${version}/ChangeLog"; + license = with lib.licenses; [ + gpl2Only + lgpl21Plus + ]; + maintainers = [ ]; + platforms = lib.platforms.linux; }; } From b91a772ab40be099c574b27f95ed45b41ed932e1 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 6 Mar 2025 12:55:36 +0100 Subject: [PATCH 086/348] python3Packages.enum34: remove --- .../python-modules/enum34/default.nix | 28 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/development/python-modules/enum34/default.nix diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix deleted file mode 100644 index 940fe7af28d3..000000000000 --- a/pkgs/development/python-modules/enum34/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonAtLeast, - unittestCheckHook, -}: - -if pythonAtLeast "3.4" then - null -else - buildPythonPackage rec { - pname = "enum34"; - version = "1.1.10"; - - src = fetchPypi { - inherit pname version; - sha256 = "cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"; - }; - - nativeCheckInputs = [ unittestCheckHook ]; - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/enum34"; - description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; - license = licenses.bsd0; - }; - } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5c9dc87970b7..a184aedbaffc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -203,6 +203,7 @@ mapAliases ({ email_validator = email-validator; # added 2022-06-22 enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15 + enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06 et_xmlfile = et-xmlfile; # added 2023-10-16 etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52710770960b..a83bf1765430 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4273,8 +4273,6 @@ self: super: with self; { enturclient = callPackage ../development/python-modules/enturclient { }; - enum34 = callPackage ../development/python-modules/enum34 { }; - env-canada = callPackage ../development/python-modules/env-canada { }; environmental-override = callPackage ../development/python-modules/environmental-override { }; From d3b4764f651511d2490155c00ee80d1510940020 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 5 Mar 2025 23:15:37 -0700 Subject: [PATCH 087/348] flite: fix build for FreeBSD --- pkgs/by-name/fl/flite/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix index 514ded67728a..641697bf286a 100644 --- a/pkgs/by-name/fl/flite/package.nix +++ b/pkgs/by-name/fl/flite/package.nix @@ -31,14 +31,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Tq5pyg3TiQt8CPqGXTyLOaGgaeLTmPp+Duw3+2VAF9g="; }; - # https://github.com/festvox/flite/pull/60. - # Replaces `ar` with `$(AR)` in config/common_make_rules. - # Improves cross-compilation compatibility. patches = [ + # https://github.com/festvox/flite/pull/60. + # Replaces `ar` with `$(AR)` in config/common_make_rules. + # Improves cross-compilation compatibility. (fetchpatch { url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; hash = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; }) + # patch missing bsd conditions in configure + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/0d316feccaf89c1bd804d6001274426a7135c93a/audio/flite/files/patch-configure"; + hash = "sha256-D2wOtmHFcuA8JRtIds03yPrBGtMuhLJHuufEQdpcB58="; + extraPrefix = ""; + }) ]; buildInputs = lib.optional stdenv.hostPlatform.isLinux ( From 945810d76ec776780038cdac77ce5cae23b4b3ca Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 6 Mar 2025 11:32:57 -0700 Subject: [PATCH 088/348] webrtc-audio-processing: Fix build for FreeBSD --- .../libraries/webrtc-audio-processing/0.3.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index c9141b34a94d..92567d5c69e2 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, darwin }: +{ lib, stdenv, fetchurl, fetchpatch, darwin, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; @@ -20,8 +20,25 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/uploads/2994c0512aaa76ebf41ce11c7b9ba23e/webrtc-audio-processing-0.2-big-endian.patch"; hash = "sha256-zVAj9H8SJureQd0t5O5v1je4ia8/gHJOXYxuEBEB6gg="; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/2f3c3b1d9dadc25356da4b612130bf4dea27b817/audio/webrtc-audio-processing0/files/patch-configure.ac"; + hash = "sha256-IOSW3ZLIuRXY/M+MU813M9o0Vu4mcGoAtdNRlJwESHw="; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/27f26f19a34755fe4b939a7210d8ba7ee9358a0d/audio/webrtc-audio-processing0/files/patch-webrtc_base_stringutils.h"; + hash = "sha256-j85CdFpDIPhhEquwA3P0r5djnMEGVnvfsPM2bYbURt8="; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/0d316feccaf89c1bd804d6001274426a7135c93a/audio/webrtc-audio-processing0/files/patch-webrtc_base_platform__thread.cc"; + hash = "sha256-MsZtNWv3bwxJLxpQaMqj34XIBhqAaO2NkBHjlFWZreA="; + extraPrefix = ""; + }) ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' From 5aa3d00b178b0f9165c87f006e919375bf637f25 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 6 Mar 2025 12:12:48 -0700 Subject: [PATCH 089/348] openh264: fix build for FreeBSD --- pkgs/by-name/op/openh264/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index c4518d3124ae..f62ea69a3e21 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, gtest, meson, nasm, @@ -26,6 +27,15 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + patches = [ + # https://github.com/cisco/openh264/pull/3867 + (fetchpatch { + name = "freebsd-configure.patch"; + url = "https://github.com/cisco/openh264/commit/ea8a1ad5791ee5c4e2ecf459aec235128d69b35b.patch"; + hash = "sha256-pJvh9eRxFZQ+ob4WPu/x+jr1CCpgnug1uBViLfAtBDg="; + }) + ]; + nativeBuildInputs = [ meson nasm @@ -58,6 +68,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64 ++ lib.platforms.riscv64 - ) (lib.platforms.linux ++ lib.platforms.darwin); + ) lib.platforms.unix; }; }) From 90e3540805ecf84de8de613bc72426a01e238cef Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 6 Mar 2025 13:38:37 -0700 Subject: [PATCH 090/348] redis: fix build for FreeBSD prior art: https://github.com/freebsd/freebsd-ports/blob/9e4e65dcd8a365824d683363c81ddbb01ff767dc/databases/redis/Makefile#L25 --- pkgs/by-name/re/redis/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 8e6b697aaa39..ce343567c8a2 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo"; # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.hostPlatform.isDarwin; From e27c288c0b8565069318f929a39671d959e70cd2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 5 Mar 2025 22:48:59 -0700 Subject: [PATCH 091/348] meson: Configure with -Db_lundef=false on FreeBSD Meson sets a default for all platforms which is -Db_lundef=true, meaning always add the --no-undefined flag to linker invocations. This is a consistently bad idea on FreeBSD, since the `environ` variable is provided not by libc but by the csu, leading to the linker complaining whenever it is used. --- pkgs/by-name/gl/glib/package.nix | 1 - pkgs/by-name/me/meson/package.nix | 1 + pkgs/by-name/me/meson/setup-hook.sh | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 5556e85f8566..29a15ad00397 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -249,7 +249,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dlibelf=disabled" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ - "-Db_lundef=false" "-Dxattr=false" "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD ]; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index b8acdb939ab7..bdefa68e0390 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -144,6 +144,7 @@ python3.pkgs.buildPythonApplication rec { ''; setupHook = ./setup-hook.sh; + env.hostPlatform = stdenv.targetPlatform.system; meta = { homepage = "https://mesonbuild.com"; diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 1885265eabbf..5aa5b7ed3c02 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -26,6 +26,11 @@ mesonConfigurePhase() { "--buildtype=${mesonBuildType:-plain}" ) + # --no-undefined is universally a bad idea on freebsd because environ is in the csu + if [[ "@hostPlatform@" == *-freebsd ]]; then + flagsArray+=("-Db_lundef=false") + fi + concatTo flagsArray mesonFlags mesonFlagsArray echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" From 2e512e7cf7d95f8a0249c8e4fc3ede0720a719e0 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 3 Mar 2025 00:57:23 +0800 Subject: [PATCH 092/348] python3Packages.pytestCheckHook: fix disabledTestPaths glob matching assertion Errors in Bash's process substitution doesn't get propagated outside. Replace the process substitution with Python's `-` as /dev/stdin and Bash's heredoc stdin redirection. --- .../development/interpreters/python/hooks/pytest-check-hook.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 855c770e31b1..ff95f73ba20c 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -18,7 +18,7 @@ function pytestCheckPhase() { concatTo _pathsArray disabledTestPaths for path in "${_pathsArray[@]}"; do # Check if every path glob matches at least one path - @pythonCheckInterpreter@ <(cat < Date: Fri, 7 Mar 2025 03:01:26 +0800 Subject: [PATCH 093/348] python3Packages.pytestCheckHook: add tests --- .../interpreters/python/hooks/default.nix | 49 ++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 38afdb3026b9..d8b8f661ee2a 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -146,13 +146,60 @@ in }; pytestCheckHook = callPackage ( - { makePythonHook, pytest }: + { + makePythonHook, + pytest, + # For package tests + testers, + objprint, + }: makePythonHook { name = "pytest-check-hook"; propagatedBuildInputs = [ pytest ]; substitutions = { inherit pythonCheckInterpreter; }; + passthru = { + tests = { + basic = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-basic-${previousPythonAttrs.pname}"; + }); + disabledTests = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTests-${previousPythonAttrs.pname}"; + disabledTests = [ + "test_print" + ] ++ previousPythonAttrs.disabledTests or [ ]; + }); + disabledTestPaths = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_basic.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }); + disabledTestPaths-nonexistent = testers.testBuildFailure ( + objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-nonexistent-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_foo.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }) + ); + disabledTestPaths-glob = objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-glob-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_obj*.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }); + disabledTestPaths-glob-nonexistent = testers.testBuildFailure ( + objprint.overridePythonAttrs (previousPythonAttrs: { + pname = "test-pytestCheckHook-disabledTestPaths-glob-nonexistent-${previousPythonAttrs.pname}"; + disabledTestPaths = [ + "tests/test_foo*.py" + ] ++ previousPythonAttrs.disabledTestPaths or [ ]; + }) + ); + }; + }; } ./pytest-check-hook.sh ) { }; From a9700212c5b244fca66ca163cc62227717e0b54e Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 25 Feb 2025 04:58:43 +0000 Subject: [PATCH 094/348] librsvg: generate loaders.cache even when cross compiling this fixes icons in several gtk applications, e.g. fractal, calls, etc --- .../development/libraries/librsvg/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 5a9d1a9a6121..6ae32480fd52 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -11,7 +11,6 @@ installShellFiles, pango, freetype, - harfbuzz, cairo, libxml2, bzip2, @@ -25,7 +24,6 @@ python3Packages, gnome, vala, - writeShellScript, shared-mime-info, # Requires building a cdylib. withPixbufLoader ? !stdenv.hostPlatform.isStatic, @@ -71,10 +69,28 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { + # merged in 2.60.0-beta.0 name = "cross-introspection.patch"; url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/84f24b1f5767f807f8d0442bbf3f149a0defcf78.patch"; hash = "sha256-FRyAYCCP3eu7YDUS6g7sKCdbq2nU8yQdbdVaQwLrlhE="; }) + (fetchpatch { + # merged in 2.60.0-beta.0; required for cross-gdk-pixbuf-loader.patch to apply + name = "Replace-CRLF-with-just-LF-in-a-few-remaining-files-that-had-them"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/8c93369806283feafd060f4507111344e1110f79.patch"; + hash = "sha256-FU6ZiWhXm8jPhGGuNKqlxDIEXu2bSfq1MWyQoADqLZA="; + }) + (fetchpatch { + # merged in 2.60.0-beta.0; required for cross-gdk-pixbuf-loader.patch to apply + name = "do-not-look-for-gdk-pixbuf-query-loaders-in-cross-builds.patch"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/ce2957acb7b0b5d7f75f47a3c503f5532aa698a6.patch"; + hash = "sha256-f0Mdt4GjycIkM/k68KRsR0Hv2C+gaieQ4WnhjPbA5vs="; + }) + (fetchpatch { + name = "cross-gdk-pixbuf-loader.patch"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1095.patch"; + hash = "sha256-4R/DfDkNn7WhgBy526v309FzK6znCt2dV/ooz4LYrVU="; + }) ]; cargoDeps = rustPlatform.fetchCargoVendor { @@ -92,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ - gdk-pixbuf installShellFiles pkg-config meson @@ -146,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isi686; env = { - PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = buildPackages.writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders ''; }; @@ -178,8 +193,7 @@ stdenv.mkDerivation (finalAttrs: { let emulator = stdenv.hostPlatform.emulator buildPackages; in - # Not generated when cross compiling. - lib.optionalString (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) '' + lib.optionalString withPixbufLoader '' # Merge gdkpixbuf and librsvg loaders GDK_PIXBUF=$out/${gdk-pixbuf.binaryDir} cat ${lib.getLib gdk-pixbuf}/${gdk-pixbuf.binaryDir}/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp From 55d08bb886c594f10e6c020c5502e87805e71d19 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 2 Mar 2025 21:58:34 +0800 Subject: [PATCH 095/348] buildPythonPackage: simplify check-related attribute inheritance --- .../python/mk-python-derivation.nix | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index b35356d4603b..09d2e52d276a 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -50,6 +50,9 @@ let stringLength ; + getOptionalAttrs = + names: attrs: lib.getAttrs (lib.intersectLists names (lib.attrNames attrs)) attrs; + leftPadName = name: against: let @@ -196,8 +199,6 @@ in doCheck ? true, - disabledTestPaths ? [ ], - # Allow passing in a custom stdenv to buildPython* stdenv ? python.stdenv, @@ -437,24 +438,14 @@ let installCheckPhase = attrs.checkPhase; } // optionalAttrs (attrs.doCheck or true) ( - optionalAttrs (disabledTestPaths != [ ]) { - disabledTestPaths = disabledTestPaths; - } - // optionalAttrs (attrs ? disabledTests) { - disabledTests = attrs.disabledTests; - } - // optionalAttrs (attrs ? pytestFlags) { - pytestFlags = attrs.pytestFlags; - } - // optionalAttrs (attrs ? pytestFlagsArray) { - pytestFlagsArray = attrs.pytestFlagsArray; - } - // optionalAttrs (attrs ? unittestFlags) { - unittestFlags = attrs.unittestFlags; - } - // optionalAttrs (attrs ? unittestFlagsArray) { - unittestFlagsArray = attrs.unittestFlagsArray; - } + getOptionalAttrs [ + "disabledTestPaths" + "disabledTests" + "pytestFlags" + "pytestFlagsArray" + "unittestFlags" + "unittestFlagsArray" + ] attrs ) ); From 7458444ef071aac671fded7215292d2d74bcd191 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jan 2024 22:10:26 +0100 Subject: [PATCH 096/348] libid3tag: 0.15.1b -> 0.16.3 --- .../CVE-2017-11550-and-CVE-2017-11551.patch | 13 --- .../by-name/li/libid3tag/debian-patches.patch | 89 ------------------- pkgs/by-name/li/libid3tag/id3tag.pc | 11 --- pkgs/by-name/li/libid3tag/package.nix | 66 +++++++------- 4 files changed, 34 insertions(+), 145 deletions(-) delete mode 100644 pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch delete mode 100644 pkgs/by-name/li/libid3tag/debian-patches.patch delete mode 100644 pkgs/by-name/li/libid3tag/id3tag.pc diff --git a/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch deleted file mode 100644 index b1f9d0978cec..000000000000 --- a/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch +++ /dev/null @@ -1,13 +0,0 @@ -Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++ -diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c ---- libid3tag-0.15.1b/utf16.c 2004-01-23 10:41:32.000000000 +0100 -+++ libid3tag-0.15.1b-patched/utf16.c 2018-11-01 13:12:00.866050641 +0100 -@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by - id3_ucs4_t *ucs4; - - end = *ptr + (length & ~1); -+ if (end == *ptr) -+ return 0; - - utf16 = malloc((length / 2 + 1) * sizeof(*utf16)); - if (utf16 == 0) diff --git a/pkgs/by-name/li/libid3tag/debian-patches.patch b/pkgs/by-name/li/libid3tag/debian-patches.patch deleted file mode 100644 index 0a828b334cf8..000000000000 --- a/pkgs/by-name/li/libid3tag/debian-patches.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/compat.gperf b/compat.gperf -index 4e24613..5635980 100644 ---- a/compat.gperf -+++ b/compat.gperf -@@ -236,6 +236,10 @@ int id3_compat_fixup(struct id3_tag *tag) - - encoding = id3_parse_uint(&data, 1); - string = id3_parse_string(&data, end - data, encoding, 0); -+ if (!string) -+ { -+ continue; -+ } - - if (id3_ucs4_length(string) < 4) { - free(string); -diff --git a/genre.dat b/genre.dat -index 17acab5..1f02779 100644 ---- a/genre.dat -+++ b/genre.dat -@@ -277,8 +277,8 @@ static id3_ucs4_t const genre_PUNK_ROCK[] = - { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 }; - static id3_ucs4_t const genre_DRUM_SOLO[] = - { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 }; --static id3_ucs4_t const genre_A_CAPPELLA[] = -- { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 }; -+static id3_ucs4_t const genre_A_CAPELLA[] = -+ { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 }; - static id3_ucs4_t const genre_EURO_HOUSE[] = - { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 }; - static id3_ucs4_t const genre_DANCE_HALL[] = -@@ -452,7 +452,7 @@ static id3_ucs4_t const *const genre_table[] = { - genre_DUET, - genre_PUNK_ROCK, - genre_DRUM_SOLO, -- genre_A_CAPPELLA, -+ genre_A_CAPELLA, - genre_EURO_HOUSE, - genre_DANCE_HALL, - genre_GOA, -diff --git a/genre.dat.in b/genre.dat.in -index 872de40..e71e34b 100644 ---- a/genre.dat.in -+++ b/genre.dat.in -@@ -153,7 +153,7 @@ Freestyle - Duet - Punk Rock - Drum Solo --A Cappella -+A Capella - Euro-House - Dance Hall - Goa -diff --git a/parse.c b/parse.c -index 86a3f21..947c249 100644 ---- a/parse.c -+++ b/parse.c -@@ -165,6 +165,9 @@ id3_ucs4_t *id3_parse_string(id3_byte_t const **ptr, id3_length_t length, - case ID3_FIELD_TEXTENCODING_UTF_8: - ucs4 = id3_utf8_deserialize(ptr, length); - break; -+ default: -+ /* FIXME: Unknown encoding! Print warning? */ -+ return NULL; - } - - if (ucs4 && !full) { -diff --git a/utf16.c b/utf16.c -index 70ee9d5..6e60a75 100644 ---- a/utf16.c -+++ b/utf16.c -@@ -282,5 +282,18 @@ id3_ucs4_t *id3_utf16_deserialize(id3_byte_t const **ptr, id3_length_t length, - - free(utf16); - -+ if (end == *ptr && length % 2 != 0) -+ { -+ /* We were called with a bogus length. It should always -+ * be an even number. We can deal with this in a few ways: -+ * - Always give an error. -+ * - Try and parse as much as we can and -+ * - return an error if we're called again when we -+ * already tried to parse everything we can. -+ * - tell that we parsed it, which is what we do here. -+ */ -+ (*ptr)++; -+ } -+ - return ucs4; - } \ No newline at end of file diff --git a/pkgs/by-name/li/libid3tag/id3tag.pc b/pkgs/by-name/li/libid3tag/id3tag.pc deleted file mode 100644 index e3df7b3f9df0..000000000000 --- a/pkgs/by-name/li/libid3tag/id3tag.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=@dev@/include - -Name: libid3tag -Description: ID3 tag manipulation library -Version: @version@ - -Libs: -L${libdir} -lid3tag -Cflags: -I${includedir} diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix index c8c9d8bf5103..e287ee6cdcd2 100644 --- a/pkgs/by-name/li/libid3tag/package.nix +++ b/pkgs/by-name/li/libid3tag/package.nix @@ -1,48 +1,50 @@ -{ lib, stdenv, fetchurl, zlib, gperf_3_0 }: +{ + lib, + stdenv, + fetchFromGitea, + cmake, + gperf, + zlib, +}: stdenv.mkDerivation rec { pname = "libid3tag"; - version = "0.15.1b"; + version = "0.16.3"; - src = fetchurl { - url = "mirror://sourceforge/mad/libid3tag-${version}.tar.gz"; - sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "tenacityteam"; + repo = "libid3tag"; + rev = version; + hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs="; }; - outputs = [ "out" "dev" ]; - setOutputFlags = false; + postPatch = '' + substituteInPlace packaging/id3tag.pc.in \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" + ''; strictDeps = true; - nativeBuildInputs = [ gperf_3_0 ]; - - buildInputs = [ zlib ]; - - patches = [ - ./debian-patches.patch - ./CVE-2017-11550-and-CVE-2017-11551.patch + nativeBuildInputs = [ + cmake + gperf ]; - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; + buildInputs = [ + zlib + ]; - postInstall = '' - mkdir -p $dev/lib/pkgconfig - cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc - substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ - --subst-var-by out $out \ - --subst-var-by dev $dev \ - --subst-var-by version "${version}" - ''; - - meta = with lib; { + meta = { description = "ID3 tag manipulation library"; - homepage = "https://mad.sourceforge.net/"; - license = licenses.gpl2; + homepage = "https://codeberg.org/tenacityteam/libid3tag"; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } From 73afd256562be260e38c51058902d43dc0f6eb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Mar 2025 13:31:17 +0100 Subject: [PATCH 097/348] mp3fs: misc cleanup --- pkgs/by-name/mp/mp3fs/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index 6a98b78348b8..05785669fada 100644 --- a/pkgs/by-name/mp/mp3fs/package.nix +++ b/pkgs/by-name/mp/mp3fs/package.nix @@ -25,10 +25,16 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/mp3fs.cc \ - --replace "#include " "" \ - --replace "osxfuse_version()" "fuse_version()" + --replace-fail "#include " "" \ + --replace-fail "osxfuse_version()" "fuse_version()" ''; + nativeBuildInputs = [ + autoreconfHook + pkg-config + pandoc + ]; + buildInputs = [ flac fuse @@ -36,11 +42,6 @@ stdenv.mkDerivation rec { libid3tag libvorbis ]; - nativeBuildInputs = [ - autoreconfHook - pkg-config - pandoc - ]; enableParallelBuilding = true; From b327d513a624ab6e45e2b39b46b22a5ee1ada0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Mar 2025 13:31:24 +0100 Subject: [PATCH 098/348] mp3fs: add missing zlib --- pkgs/by-name/mp/mp3fs/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index 05785669fada..0e9ee3fd0bac 100644 --- a/pkgs/by-name/mp/mp3fs/package.nix +++ b/pkgs/by-name/mp/mp3fs/package.nix @@ -10,6 +10,7 @@ autoreconfHook, pkg-config, pandoc, + zlib, }: stdenv.mkDerivation rec { @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { lame libid3tag libvorbis + zlib ]; enableParallelBuilding = true; From 24ddc2d2d0697732593469156780a7498876a881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Mar 2025 13:31:30 +0100 Subject: [PATCH 099/348] raptor: mark broken --- pkgs/development/libraries/librdf/raptor.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 1225af7f67e4..627d7a43869d 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -33,5 +33,7 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; + # error: passing argument 2 of 'xmlSetStructuredErrorFunc' from incompatible pointer type [-Wincompatible-pointer-types] + broken = true; }; } From 261633b66084ed69380b6511f311932a26caf4f5 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 19 Feb 2025 01:40:06 +0800 Subject: [PATCH 100/348] pre-commit: remove locale specification in preCheck buildPython* already provides global LANG specification. Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- pkgs/by-name/pr/pre-commit/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 9a8d5bd3a662..8c3b9aca06e6 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -7,7 +7,6 @@ coursier, dotnet-sdk, gitMinimal, - glibcLocales, go, nodejs, perl, @@ -52,7 +51,6 @@ buildPythonApplication rec { [ cargo gitMinimal - glibcLocales go libiconv # For rust tests on Darwin perl @@ -101,7 +99,7 @@ buildPythonApplication rec { + '' export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \ GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \ - VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 + VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 '' + lib.optionalString (!i686Linux) '' # Resolve `.NET location: Not found` errors for dotnet tests From e3d6fab836121dfb30390e5521e00fad0ddf46eb Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 19 Feb 2025 20:43:54 +0800 Subject: [PATCH 101/348] gpodder: Use the buildPythonPackage-provide local specification Also remove glibcLocale from nativeBuildInputs, without which the package still builds. --- pkgs/by-name/gp/gpodder/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix index adad02f16cb7..738983a6322f 100644 --- a/pkgs/by-name/gp/gpodder/package.nix +++ b/pkgs/by-name/gp/gpodder/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, gitUpdater, - glibcLocales, adwaita-icon-theme, gobject-introspection, gtk3, @@ -35,7 +34,6 @@ python311Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook3 - glibcLocales gobject-introspection ]; @@ -73,10 +71,6 @@ python311Packages.buildPythonApplication rec { "share/dbus-1/services/org.gpodder.service" ]; - preBuild = '' - export LC_ALL="en_US.UTF-8" - ''; - installCheckPhase = '' LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder From cc1e059ce6a2b4d299c4ff3ac4e4968eb722c4e2 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 03:25:51 +0800 Subject: [PATCH 102/348] buildbotPackages.buildbot: use the locale specification from buildPythonApplicaiton Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- .../tools/continuous-integration/buildbot/master.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index aa75150a1b3f..d1a77f0ab25a 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -41,7 +41,6 @@ importlib-resources, packaging, unidiff, - glibcLocales, nixosTests, }: @@ -136,7 +135,6 @@ buildPythonApplication rec { parameterized git openssh - glibcLocales ]; patches = [ @@ -155,7 +153,6 @@ buildPythonApplication rec { doCheck = !stdenv.hostPlatform.isAarch64; preCheck = '' - export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" ''; From 5f657746962c83d7fddbe3974634f47380472612 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 06:50:52 +0800 Subject: [PATCH 103/348] python3Packages.reportlab: use the locale specification from buildPythonPackage Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- pkgs/development/python-modules/reportlab/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index dd638a7b6b9c..275bfbb32cb4 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -6,7 +6,6 @@ freetype, pillow, setuptools, - glibcLocales, python, isPyPy, }: @@ -49,12 +48,10 @@ buildPythonPackage rec { pillow ]; - nativeCheckInputs = [ glibcLocales ]; - checkPhase = '' runHook preCheck pushd tests - LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py + ${python.interpreter} runAll.py popd runHook postCheck ''; From 597b3c6f545ab03f1f6a59d3fd2cd00aebf1dcea Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 06:54:11 +0800 Subject: [PATCH 104/348] python3Packages.pathlib2: use the locale specification from buildPythonPackage Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- pkgs/development/python-modules/pathlib2/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index c439b1b04cf9..5e5663c054af 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,6 @@ six, pythonOlder, scandir ? null, - glibcLocales, typing, }: @@ -25,11 +24,6 @@ buildPythonPackage rec { scandir typing ]; - nativeCheckInputs = [ glibcLocales ]; - - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; meta = with lib; { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems"; From b7930587c7a7a346f08027ee213c55e9206a593e Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:02:21 +0800 Subject: [PATCH 105/348] python3Packages.ephem: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/ephem/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index c3c0a9c0bc1b..1ac8fe9bef59 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - glibcLocales, pytest, }: @@ -17,13 +16,12 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - glibcLocales pytest ]; # JPLTest uses assets not distributed in package checkPhase = '' - LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest" + pytest --pyargs ephem.tests -k "not JPLTest" ''; pythonImportsCheck = [ "ephem" ]; From 511673c81f5e643cdf1cd8ab6647b4925e692545 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 106/348] python3Packages.cligj: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/cligj/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 9be9ce2f5aca..1d3c57b3edfc 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, click, pytest, - glibcLocales, }: buildPythonPackage rec { @@ -23,11 +22,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - glibcLocales ]; checkPhase = '' - LC_ALL=en_US.utf-8 pytest tests + pytest tests ''; meta = with lib; { From 7077d1e81f569677a02bf101dd7f75ba42f0e316 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 06:50:52 +0800 Subject: [PATCH 107/348] python3Packages.pymediainfo: use the locale specification from buildPythonPackage Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- pkgs/development/python-modules/pymediainfo/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 016b5ee6bf24..7ebd4dbc5503 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -6,7 +6,6 @@ libmediainfo, setuptools-scm, pytest, - glibcLocales, pythonOlder, }: @@ -35,12 +34,10 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ - glibcLocales pytest ]; checkPhase = '' - export LC_ALL=en_US.UTF-8 py.test -k 'not test_parse_url' tests ''; From a93c0f72d776338ddbdc7197468071d4257460ab Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 108/348] python3Packages.pyrect: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/pyrect/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index 3b673068adaa..757ad7ef886b 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -22,10 +22,6 @@ buildPythonPackage rec { pygame ]; - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; - pythonImportsCheck = [ "pyrect" ]; meta = with lib; { From ae063b98c043d236820a46816bd9f9474fbe832d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 21 Feb 2025 04:39:56 +0800 Subject: [PATCH 109/348] python3Packages.pygel: reset locales after checks --- pkgs/development/python-modules/pygal/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 2eef6797cbf5..52265c6ae970 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + stdenv, # build-system setuptools, @@ -55,6 +56,10 @@ buildPythonPackage rec { export LANG=en_US.UTF-8 ''; + postCheck = '' + export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + ''; + meta = with lib; { description = "Module for dynamic SVG charting"; homepage = "http://www.pygal.org"; From 2019f449a415430b79ea9182cfa0da112d84fb69 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 110/348] python3Packages.gruut: use the locale specification from buildPythonPackage Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- pkgs/development/python-modules/gruut/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index ce857f574982..052cc3c69cf0 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -22,7 +22,6 @@ rapidfuzz, # checks - glibcLocales, pytestCheckHook, }: @@ -91,7 +90,6 @@ buildPythonPackage rec { ]); nativeCheckInputs = [ - glibcLocales pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); @@ -104,10 +102,6 @@ buildPythonPackage rec { "test_ar" ]; - preCheck = '' - export LC_ALL=en_US.utf-8 - ''; - pythonImportsCheck = [ "gruut" ]; meta = with lib; { From 5207d05960db394e387e381cf47fded865fc2b42 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 111/348] python3Packages.jieba: use the locale specification from buildPythonPackage Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- pkgs/development/python-modules/jieba/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index d6ea70b40011..efce378d706b 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - glibcLocales, python, isPy3k, }: @@ -20,15 +19,12 @@ buildPythonPackage rec { sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; - nativeCheckInputs = [ glibcLocales ]; - # UnicodeEncodeError doCheck = isPy3k; # Citing https://github.com/fxsjy/jieba/issues/384: "testcases is in a mess" # So just picking random ones that currently work checkPhase = '' - export LC_ALL=en_US.UTF-8 ${python.interpreter} test/test.py ${python.interpreter} test/test_tokenize.py ''; From a6fa75556e14909b2b8b7d8f9d06bb74f79863db Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 112/348] python3Packages.nipype: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/nipype/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index fd4b616682f3..a41b34aa4b5b 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -93,7 +93,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display and not test_no_et_multiproc' + pytest nipype/tests -k 'not display and not test_no_et_multiproc' ''; pythonImportsCheck = [ "nipype" ]; From f66830a7b467ab5dbb8915a53b9b0368156de966 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 113/348] python3Packages.configparser: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/configparser/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 2c9981db34a6..e8b45599e1ea 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -27,10 +26,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preConfigure = '' - export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 - ''; - meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+"; homepage = "https://github.com/jaraco/configparser"; From f2487d1b69b1aac5a9ad720350ccadd38643dea6 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 21 Feb 2025 05:48:26 +0800 Subject: [PATCH 114/348] python3Packages.python-magic: unset LC_ALL at the end of checks --- pkgs/development/python-modules/python-magic/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index c84659014b71..ee9503865f70 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -44,6 +44,10 @@ buildPythonPackage rec { export LC_ALL=en_US.UTF-8 ''; + postCheck = '' + unset LC_ALL + ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { From 46f20b456ef2cd8a10685fd2bde0d5f8d71ee2e1 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 115/348] python3Packages.sympy: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/sympy/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index a05d13f466ee..a6c5d1fca425 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -27,10 +27,6 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "sympy" ]; - preCheck = '' - export LANG="en_US.UTF-8" - ''; - passthru.tests = { inherit sage; }; From 13475c2ed68afdae8e46dc9eae8f71a291cdf69b Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 116/348] python3Packages.pandas: use the locale specification from buildPythonPackage Also remove glibcLocale from nativeCheckInputs, without which the package still builds. --- pkgs/development/python-modules/pandas/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2a96029a4139..122d5d1b538d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -53,7 +53,6 @@ # tests adv_cmds, glibc, - glibcLocales, hypothesis, pytestCheckHook, pytest-xdist, @@ -179,7 +178,6 @@ let nativeCheckInputs = [ - glibcLocales hypothesis pytest-asyncio pytest-xdist @@ -231,7 +229,6 @@ let preCheck = '' export HOME=$TMPDIR - export LC_ALL="en_US.UTF-8" cd $out/${python.sitePackages}/pandas '' # TODO: Get locale and clipboard support working on darwin. From efccb4a888505756ebd86d75a1ea79ee674c3806 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 117/348] python3Packages.pyopenssl: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/pyopenssl/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 44a525bcb695..b06e746987a0 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -51,10 +51,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - preCheck = '' - export LANG="en_US.UTF-8" - ''; - disabledTests = [ # https://github.com/pyca/pyopenssl/issues/692 From 7c93ee15979be90bf1dae31c22f40174e0741212 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 07:13:46 +0800 Subject: [PATCH 118/348] python3Packages.docutils: use the locale specification from buildPythonPackage --- pkgs/development/python-modules/docutils/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 260befeb00f4..2789c78eca25 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromRepoOrCz, buildPythonPackage, @@ -34,13 +33,9 @@ let nativeCheckInputs = [ pillow ]; - # Only Darwin needs LANG, but we could set it in general. - # It's done here conditionally to prevent mass-rebuilds. - checkPhase = - lib.optionalString stdenv.hostPlatform.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' - + '' - ${python.interpreter} test/alltests.py - ''; + checkPhase = '' + ${python.interpreter} test/alltests.py + ''; # Create symlinks lacking a ".py" suffix, many programs depend on these names postFixup = '' From 77050724f56df3927b31d94d50a5308021ea9eca Mon Sep 17 00:00:00 2001 From: Nicky Mouha Date: Sun, 2 Mar 2025 22:30:53 -0500 Subject: [PATCH 119/348] ffmpeg: 7.1 -> 7.1.1 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/generic.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index d07551608a54..dfeedd46896f 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -26,8 +26,8 @@ let }; v7 = { - version = "7.1"; - hash = "sha256-erTkv156VskhYEJWjpWFvHjmcr2hr6qgUi28Ho8NFYk="; + version = "7.1.1"; + hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4="; }; in diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 650db88130ad..6944f223b065 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -462,9 +462,10 @@ stdenv.mkDerivation ( hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y="; }) ] - ++ optionals (lib.versionAtLeast version "7.1") [ + ++ optionals (lib.versionAtLeast version "7.1" && lib.versionOlder version "7.1.1") [ ./fix-fate-ffmpeg-spec-disposition-7.1.patch - + ] + ++ optionals (lib.versionAtLeast version "7.1.1") [ # Expose a private API for Chromium / Qt WebEngine. (fetchpatch2 { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/raw/a02c1a15706ea832c0d52a4d66be8fb29499801a/add-av_stream_get_first_dts-for-chromium.patch"; From 7fe54a62eac171a83eae57516f38d861ac5de267 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:16 +0100 Subject: [PATCH 120/348] python313Packages.bluetooth-sensor-state-data: migrate to pytest-cov-stub --- .../bluetooth-sensor-state-data/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 0a42ad1da817..cd888a28b16b 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -23,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-W+gU9YlxoCh5zRht44Ovq3Doms8UtCvUNLlSUpzsQwA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -35,7 +31,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "bluetooth_sensor_state_data" ]; From cbcefe9919bd36cd13f53700e1db3bfe0eb6fad4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:16 +0100 Subject: [PATCH 121/348] python313Packages.brunt: migrate to pytest-cov-stub --- pkgs/development/python-modules/brunt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/brunt/default.nix b/pkgs/development/python-modules/brunt/default.nix index 232dae5cf1d3..a74b3725ba75 100644 --- a/pkgs/development/python-modules/brunt/default.nix +++ b/pkgs/development/python-modules/brunt/default.nix @@ -5,6 +5,7 @@ fetchPypi, aiohttp, requests, + pytest-cov-stub, pytestCheckHook, }: @@ -21,16 +22,15 @@ buildPythonPackage rec { sha256 = "e704627dc7b9c0a50c67ae90f1d320b14f99f2b2fc9bf1ef0461b141dcf1bce9"; }; - postPatch = '' - sed -i '/--cov/d' setup.cfg - ''; - propagatedBuildInputs = [ aiohttp requests ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; # tests require Brunt hardware doCheck = false; From 81f5311e7c2c718caeeb825e0274181ab1ec4e17 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:17 +0100 Subject: [PATCH 122/348] python313Packages.certauth: migrate to pytest-cov-stub --- pkgs/development/python-modules/certauth/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index d68cbd3481c2..a3d1b9f25c95 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -5,6 +5,7 @@ setuptools, pyopenssl, tldextract, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -24,11 +25,6 @@ buildPythonPackage rec { hash = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "--cov certauth " "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -36,7 +32,10 @@ buildPythonPackage rec { tldextract ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "certauth" ]; From ce001535ebe3483d5886c8e00a62f1ef721e708b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:17 +0100 Subject: [PATCH 123/348] python313Packages.cfn-flip: migrate to pytest-cov-stub --- pkgs/development/python-modules/cfn-flip/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index e10440bd3d3e..e5ae3494d88b 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, click, fetchFromGitHub, + pytest-cov-stub, pytestCheckHook, pythonOlder, pyyaml, @@ -29,11 +30,10 @@ buildPythonPackage rec { six ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - sed -i "/--cov/d" tox.ini - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; disabledTests = [ # TypeError: load() missing 1 required positional argument: 'Loader' From 24cec2c80958ba5193d35b152dd6b9731d1ad695 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:17 +0100 Subject: [PATCH 124/348] python313Packages.cftime: migrate to pytest-cov-stub --- pkgs/development/python-modules/cftime/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index ef33cb69e1ce..06ef5881e993 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -4,6 +4,7 @@ cython, fetchPypi, numpy, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -20,10 +21,6 @@ buildPythonPackage rec { hash = "sha256-UKx2zJ8Qq3vUbkSnHFGmknBRtJm0QH308pqxPXQblC8="; }; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - nativeBuildInputs = [ cython numpy @@ -31,7 +28,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "cftime" ]; From 543761aab569e3ccadad7dd170e0b19654e8fe2c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:17 +0100 Subject: [PATCH 125/348] python313Packages.chacha20poly1305-reuseable: migrate to pytest-cov-stub --- .../chacha20poly1305-reuseable/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index d22abf8c9164..4b4ab02edc77 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -13,6 +13,7 @@ cryptography, # tests + pytest-cov-stub, pytestCheckHook, }: @@ -46,12 +47,10 @@ buildPythonPackage { pythonImportsCheck = [ "chacha20poly1305_reuseable" ]; - preCheck = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" "" - ''; - - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { description = "ChaCha20Poly1305 that is reuseable for asyncio"; From 63547d821fae7ea23fd17e496fa2720fc2d9f535 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:17 +0100 Subject: [PATCH 126/348] python313Packages.cherrypy: migrate to pytest-cov-stub --- pkgs/development/python-modules/cherrypy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 7f3bd134f29f..fbef13be43ad 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -10,6 +10,7 @@ path, portend, pyopenssl, + pytest-cov-stub, pytest-forked, pytest-services, pytestCheckHook, @@ -38,10 +39,7 @@ buildPythonPackage rec { postPatch = '' # Disable doctest plugin because times out substituteInPlace pytest.ini \ - --replace-fail "--doctest-modules" "-vvv" \ - --replace-fail "-p pytest_cov" "" \ - --replace-fail "--no-cov-on-fail" "" - sed -i "/--cov/d" pytest.ini + --replace-fail "--doctest-modules" "-vvv" ''; build-system = [ setuptools-scm ]; @@ -57,6 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ objgraph path + pytest-cov-stub pytest-forked pytest-services pytestCheckHook From a665a7a914b0288215fb96c9001ea586f366cffe Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 21 Feb 2025 19:20:18 +0100 Subject: [PATCH 127/348] python313Packages.click-repl: migrate to pytest-cov-stub --- pkgs/development/python-modules/click-repl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 66acdd9d145d..201e0d8d4253 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -12,6 +12,7 @@ six, # tests + pytest-cov-stub, pytestCheckHook, }: @@ -27,10 +28,6 @@ buildPythonPackage rec { hash = "sha256-xCT3w0DDY73dtDL5jbssXM05Zlr44OOcy4vexgHyWiE="; }; - postPatch = '' - sed -i '/--cov=/d' pyproject.toml - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -39,7 +36,10 @@ buildPythonPackage rec { six ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/click-contrib/click-repl"; From d624a472def5c131178cf65d94d095e40f2d27e8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 9 Mar 2025 06:29:51 +0000 Subject: [PATCH 128/348] xorg.xauth: 1.1.3 -> 1.1.4 Changes: https://lists.x.org/archives/xorg-announce/2025-March/003589.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ec00bd98bf0d..280bcdaf4879 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2143,11 +2143,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xauth"; - version = "1.1.3"; + version = "1.1.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xauth-1.1.3.tar.xz"; - sha256 = "0cwxzq7lv932rcfad3baanr541qcjjdhyrhxy0bzjcp3pac581z7"; + url = "mirror://xorg/individual/app/xauth-1.1.4.tar.xz"; + sha256 = "1466a5hj0rm7sm0cr253hmy9f3yjy20aar451zfb9msa8r0q2cg9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 90ad945d7fda..8809e1a4e718 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -21,7 +21,7 @@ mirror://xorg/individual/app/transset-1.0.3.tar.xz mirror://xorg/individual/app/twm-1.0.12.tar.xz mirror://xorg/individual/app/viewres-1.0.7.tar.xz mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 -mirror://xorg/individual/app/xauth-1.1.3.tar.xz +mirror://xorg/individual/app/xauth-1.1.4.tar.xz mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 mirror://xorg/individual/app/xcalc-1.1.2.tar.xz mirror://xorg/individual/app/xclock-1.1.1.tar.xz From 1c1aba79872dbd9b9a0bdcc394d1e803c13f6c28 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 8 Mar 2025 19:25:55 +0100 Subject: [PATCH 129/348] libqmi: unbreak cross compilation With meson 1.7.0 files needed for testing are not built by default [1]. `libqmi` has incorrectly configured dependencies for gtk-doc generation thus they are not built unless tests are run [2]. Since check phase is skipped for cross compiling this was causing the build failures, while the regular builds were unaffected. Setting `doCheck` to false will cause the install phase to fail also when compiling the package natively. [1]: https://mesonbuild.com/Release-notes-for-1-7-0.html#test-targets-no-longer-built-by-default [2]: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 --- .../li/libqmi/build_doc_deps_by_default.patch | 12 ++++++++++++ pkgs/by-name/li/libqmi/package.nix | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch diff --git a/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch new file mode 100644 index 000000000000..f9ffbb589bf7 --- /dev/null +++ b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch @@ -0,0 +1,12 @@ +diff --git a/docs/reference/libqmi-glib/meson.build b/docs/reference/libqmi-glib/meson.build +index 2f5cfc3..14e1aea 100644 +--- a/docs/reference/libqmi-glib/meson.build ++++ b/docs/reference/libqmi-glib/meson.build +@@ -57,6 +57,7 @@ sections_txt = custom_target( + capture: true, + command: [find_program('cat'), '@INPUT@'] + gen_sections, + depends: gen_sections_deps, ++ build_by_default: true, + ) + + version_xml = configure_file( diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix index 1bd3a50715ef..daa61c7d3a1e 100644 --- a/pkgs/by-name/li/libqmi/package.nix +++ b/pkgs/by-name/li/libqmi/package.nix @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { ]; doCheck = true; + patches = [ + # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 + ./build_doc_deps_by_default.patch + ]; postPatch = '' patchShebangs \ From 9270d7cbb6d5cab7d403819df811092713f599f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sun, 9 Mar 2025 14:20:48 +0100 Subject: [PATCH 130/348] nixos/installation-device: add jq.all to extraDependencies As discovered in https://github.com/NixOS/nixpkgs/pull/372931, we need the dev output of jq for closureInfo. We opt to add the whole thing. --- nixos/modules/profiles/installation-device.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a4e5a4aac790..7fcd525263b1 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -102,10 +102,10 @@ with lib; stdenv stdenvNoCC # for runCommand busybox - jq # for closureInfo # For boot.initrd.systemd makeInitrdNGTool - ]; + ] + ++ jq.all; # for closureInfo boot.swraid.enable = true; # remove warning about unset mail From bc157d1d01af4ff4906071ff580b28fc8ae3f597 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 9 Mar 2025 16:03:30 +0100 Subject: [PATCH 131/348] gst_all_1.gst-plugins-base: disable libvisual --- pkgs/development/libraries/gstreamer/base/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 11bf17aea7a6..8bd7a4be51de 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -16,7 +16,6 @@ , isocodes , libjpeg , libpng -, libvisual , tremor # provides 'virbisidec' , libGL , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages @@ -97,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libdrm libGL - libvisual ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ] ++ lib.optionals enableAlsa [ @@ -124,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) + (lib.mesonEnable "libvisual" false) ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dtests=disabled" ] @@ -132,10 +131,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!enableGl) "-Dgl=disabled" ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-Ddrm=disabled" - "-Dlibvisual=disabled" - ]; + ++ lib.optional stdenv.hostPlatform.isDarwin "-Ddrm=disabled"; postPatch = '' patchShebangs \ From 7a4e2d47eabb4d6f033e640a6edb06da93bf3703 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 9 Mar 2025 16:31:00 +0100 Subject: [PATCH 132/348] libvisual: drop --- pkgs/by-name/li/libvisual/package.nix | 58 --------------------------- 1 file changed, 58 deletions(-) delete mode 100644 pkgs/by-name/li/libvisual/package.nix diff --git a/pkgs/by-name/li/libvisual/package.nix b/pkgs/by-name/li/libvisual/package.nix deleted file mode 100644 index a2a559deccf2..000000000000 --- a/pkgs/by-name/li/libvisual/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - SDL, - autoreconfHook, - autoconf-archive, - glib, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "libvisual"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "Libvisual"; - repo = "libvisual"; - rev = "libvisual-${version}"; - hash = "sha256-bDnpQODXB2Z6hezVoh7c6cklp6qpyDzVBAnwZD8Gros="; - }; - - sourceRoot = "${src.name}/libvisual"; - - outputs = [ - "out" - "dev" - ]; - - strictDeps = true; - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - pkg-config - ]; - buildInputs = [ - SDL - glib - ]; - - configureFlags = - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Remove when 0.5.x is published. - "--disable-lv-tool" - ] - ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; - - meta = { - description = "Abstraction library for audio visualisations"; - homepage = "https://sourceforge.net/projects/libvisual/"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - }; -} From 3c64ac2c3496c4ddcacc004bdd67c47e4c7dbacf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Mar 2025 21:37:36 +0000 Subject: [PATCH 133/348] =?UTF-8?q?gi-docgen:=202024.1=20=E2=86=92=202025.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gi-docgen/-/compare/2024.1...2025.3 --- pkgs/by-name/gi/gi-docgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index 0f350cdbbd62..0401fedd1290 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2024.1"; + version = "2025.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-hwx3+WIEYszknjVUKkLcFhL8hYcz6D274kjFNUWK7B4="; + hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg="; }; depsBuildBuild = [ From bec11184658d68d948e4283c409f7078e7b74061 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Mar 2025 21:37:39 +0000 Subject: [PATCH 134/348] =?UTF-8?q?glib:=202.82.4=20=E2=86=92=202.82.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.82.4...2.82.5 --- pkgs/by-name/gl/glib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 29a15ad00397..04a4a43e6b96 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.82.4"; + version = "2.82.5"; outputs = [ "bin" @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-N90Id/6WTNFemicQsEShgw+xvZNlKm0Mtriy3/GHxwk="; + hash = "sha256-BcIDH5vfa1q6egbKhPC0rO0osZvxtQxqslzGdSd8vD8="; }; patches = From df7f864ae98c5d0e5989bb485d28993eec6be3fa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Mar 2025 00:54:03 +0100 Subject: [PATCH 135/348] =?UTF-8?q?polkit:=20124=20=E2=86=92=20126?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/polkit-org/polkit/compare/124...126 - Read actions also from /etc/, /run/ and /usr/local/share/ https://github.com/polkit-org/polkit/commit/9958c259f82b066f613d171d2934c1bd829e31a4 - Same for rules https://github.com/polkit-org/polkit/commit/6c5705e0d36a8b893cf2d0f888d88b0c7c19edc9 https://github.com/polkit-org/polkit/commit/9345fd50b34827ba226cc7ff042624a7ed3abb6f - systemd-tmpfiles.d integration – unnecessary, we already have `/etc` managed by NixOS. - Drop mocklibc. - The new test wrapper no longer requires us to run dbus session ourselves. --- ...otdir-in-Meson-generated-pkg-config-.patch | 13 ++-- pkgs/by-name/po/polkit/elogind.patch | 66 ---------------- pkgs/by-name/po/polkit/package.nix | 75 +++++++------------ pkgs/by-name/po/polkit/system_bus.conf | 58 -------------- 4 files changed, 31 insertions(+), 181 deletions(-) delete mode 100644 pkgs/by-name/po/polkit/elogind.patch delete mode 100644 pkgs/by-name/po/polkit/system_bus.conf diff --git a/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch index 4e38660217fe..bef49a26ad44 100644 --- a/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch +++ b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch @@ -1,4 +1,4 @@ -From 7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3 Mon Sep 17 00:00:00 2001 +From 5db2dee82bf652cca5fd782c19c8cc8e7ad5ed3e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Nov 2021 14:17:17 +0100 Subject: [PATCH] build: Use datarootdir in Meson-generated pkg-config files @@ -29,18 +29,17 @@ in the generated pkg-config files, mirroring Autotools. 2. https://www.gnu.org/prep/standards/html_node/Directory-Variables.html 3. https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/ --- - src/polkit/meson.build | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + src/polkit/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/polkit/meson.build b/src/polkit/meson.build -index 63dc1e85..c92cb70f 100644 +index a7ce02b..9192a36 100644 --- a/src/polkit/meson.build +++ b/src/polkit/meson.build -@@ -113,9 +113,8 @@ pkg.generate( +@@ -114,8 +114,8 @@ pkg.generate( requires: common_deps, variables: [ 'exec_prefix=${prefix}', -- 'datadir=' + ('${prefix}' / pk_datadir), - 'policydir=' + ('${datadir}' / pk_actiondir), - 'actiondir=' + ('${datadir}' / pk_actiondir), + 'policydir=' + ('${prefix}' / 'share' / pk_actiondir), @@ -49,5 +48,5 @@ index 63dc1e85..c92cb70f 100644 ], ) -- -GitLab +2.48.1 diff --git a/pkgs/by-name/po/polkit/elogind.patch b/pkgs/by-name/po/polkit/elogind.patch deleted file mode 100644 index e7d97a7b131c..000000000000 --- a/pkgs/by-name/po/polkit/elogind.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 78e625dbafa8543b17ffaf9c42cf90c9cf9a612e Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 8 May 2024 11:20:42 +0200 -Subject: [PATCH] Fix configuration with elogind - -Previously, it would try to get sysusers_dir from systemd even though -systemd_dep was undefined. Determining systemd_systemdsystemunitdir -from systemd was already checking for systemd logind specifically, and -systemd_sysusers_dir is only used in the systemd logind case, so move -both of those into the systemd-logind-specific branch above. - -(cherry picked from commit b58b58af10c390ab9a11a4cfe6a4ff3d50cc0fa5) ---- - meson.build | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index 2f81c90..0888322 100644 ---- a/meson.build -+++ b/meson.build -@@ -202,6 +202,16 @@ if enable_logind - if not logind_dep.found() - logind_dep = dependency('libsystemd-login', not_found_message: 'libsystemd support requested but libsystemd or libsystemd-login library not found') - endif -+ -+ # systemd unit / service files -+ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -+ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -+ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -+ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -+ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -+ endif -+ -+ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - else - logind_dep = dependency('libelogind', not_found_message: 'libelogind support requested but libelogind library not found') - endif -@@ -210,16 +220,6 @@ if enable_logind - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) - func = 'sd_pidfd_get_session' - config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) -- -- # systemd unit / service files -- systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') -- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' -- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used -- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') -- endif -- -- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') - endif - config_h.set('HAVE_LIBSYSTEMD', enable_logind) - -@@ -404,7 +404,7 @@ output += ' introspection: ' + enable_introspection.to_string( - output += ' Distribution/OS: ' + os_type + '\n' - output += ' Authentication framework: ' + auth_fw + '\n' - output += ' Session tracking: ' + session_tracking + '\n' --if enable_logind -+if session_tracking == 'logind' - output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n' - endif - output += ' polkitd user: ' + polkitd_user + ' \n' --- -2.44.0 - diff --git a/pkgs/by-name/po/polkit/package.nix b/pkgs/by-name/po/polkit/package.nix index a02a4dbbc1c1..1ecf173e5608 100644 --- a/pkgs/by-name/po/polkit/package.nix +++ b/pkgs/by-name/po/polkit/package.nix @@ -17,10 +17,10 @@ libxslt, docbook-xsl-nons, dbus, + util-linux, docbook_xml_dtd_412, gtk-doc, coreutils, - fetchpatch, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, systemdMinimal, elogind, @@ -41,7 +41,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "124"; + version = "126"; outputs = [ "bin" @@ -54,22 +54,13 @@ stdenv.mkDerivation rec { owner = "polkit-org"; repo = "polkit"; rev = version; - hash = "sha256-Vc9G2xK6U1cX+xW2BnKp3oS/ACbSXS/lztbFP5oJOlM="; + hash = "sha256-ZSqgW//q5DFIsmY17U93mJcK/CHSCHphKTHsTxp40q8="; }; patches = [ # Allow changing base for paths in pkg-config file as before. # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch - - ./elogind.patch - - # FIXME: remove in the next release - # https://github.com/NixOS/nixpkgs/issues/18012 - (fetchpatch { - url = "https://github.com/polkit-org/polkit/commit/f93c7466039ea3403e0576928aeb620b806d0cce.patch"; - sha256 = "sha256-cF0nNovYmyr+XixpBgQFF0A+oJeSPGZgTkgDQkQuof8="; - }) ]; depsBuildBuild = [ @@ -116,6 +107,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dbus + util-linux # for mount (python3.pythonOnBuildForHost.withPackages ( pp: with pp; [ dbus-python @@ -127,67 +119,50 @@ stdenv.mkDerivation rec { )) ]; - env = - { - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSUSERS_DIR = "${placeholder "out"}/lib/sysusers.d"; + PKG_CONFIG_SYSTEMD_TMPFILES_DIR = "${placeholder "out"}/lib/tmpfiles.d"; - # HACK: We want to install policy files files to $out/share but polkit - # should read them from /run/current-system/sw/share on a NixOS system. - # Similarly for config files in /etc. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "dest"; - } - // lib.optionalAttrs (stdenv.cc.isGNU || stdenv.cc.isClang) { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; + # HACK: We want to install policy files files to $out/share but polkit + # should read them from /run/current-system/sw/share on a NixOS system. + # Similarly for config files in /etc. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "dest"; + }; mesonFlags = [ "--datadir=${system}/share" "--sysconfdir=/etc" "-Dpolkitd_user=polkituser" # TODO? config.ids.uids.polkituser - "-Dos_type=redhat" # only affects PAM includes + "-Dos_type=redhat" # affects PAM includes and privileged group name (wheel) "-Dintrospection=${lib.boolToString withIntrospection}" "-Dtests=${lib.boolToString doCheck}" "-Dgtk_doc=${lib.boolToString withIntrospection}" "-Dman=true" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" + "-Dsession_tracking=${if useSystemd then "logind" else "elogind"}" ]; inherit doCheck; postPatch = '' - patchShebangs test/polkitbackend/polkitbackendjsauthoritytest-wrapper.py + patchShebangs \ + test/wrapper.py # ‘libpolkit-agent-1.so’ should call the setuid wrapper on # NixOS. Hard-coding the path is kinda ugly. Maybe we can just # call through $PATH, but that might have security implications. substituteInPlace src/polkitagent/polkitagentsession.c \ - --replace 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' + --replace-fail 'PACKAGE_PREFIX "/lib/polkit-1/' '"${setuid}/' substituteInPlace test/data/etc/polkit-1/rules.d/10-testing.rules \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /bin/false ${coreutils}/bin/false - ''; - - postConfigure = lib.optionalString doCheck '' - # Unpacked by meson - chmod +x subprojects/mocklibc-1.0/bin/mocklibc - patchShebangs subprojects/mocklibc-1.0/bin/mocklibc - ''; - - checkPhase = '' - runHook preCheck - - # tests need access to the system bus - dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS meson test --print-errorlogs' - - runHook postCheck + --replace-fail /bin/true ${coreutils}/bin/true \ + --replace-fail /bin/false ${coreutils}/bin/false ''; postInstall = '' @@ -212,6 +187,6 @@ stdenv.mkDerivation rec { # mandatory libpolkit-gobject shared library lib.systems.inspect.platformPatterns.isStatic ]; - maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); + maintainers = teams.freedesktop.members; }; } diff --git a/pkgs/by-name/po/polkit/system_bus.conf b/pkgs/by-name/po/polkit/system_bus.conf deleted file mode 100644 index 435b4740a2f7..000000000000 --- a/pkgs/by-name/po/polkit/system_bus.conf +++ /dev/null @@ -1,58 +0,0 @@ - - - - system - - - - - - - - - EXTERNAL - - - unix:path=/tmp/system_bus_socket - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 8a7bf613dd6b080296c33937c0e43f41732b777a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Mar 2025 00:43:42 +0000 Subject: [PATCH 136/348] kdePackages.qca: 2.3.9 -> 2.3.10 --- pkgs/development/libraries/qca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qca/default.nix b/pkgs/development/libraries/qca/default.nix index 1f9524357c34..0412c725079c 100644 --- a/pkgs/development/libraries/qca/default.nix +++ b/pkgs/development/libraries/qca/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "qca"; - version = "2.3.9"; + version = "2.3.10"; src = fetchurl { url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-xVXVKYzde2uv4rH5YQbzDPpUOiPUWdUMipHqwzxHbk4="; + sha256 = "sha256-HFtyLak9VZNlcZImuxIccm7DwNxMZ96jTx5Q5ODRSgI="; }; buildInputs = [ From c6a9d36e25ca85c9a59e2771766a18cff7d3dfde Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 10 Mar 2025 06:51:02 +0000 Subject: [PATCH 137/348] xorg.libX11: 1.8.11 -> 1.8.12 Changes: https://lists.x.org/archives/xorg-announce/2025-March/003587.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ec00bd98bf0d..5711c1edba05 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1123,11 +1123,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libX11"; - version = "1.8.11"; + version = "1.8.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.11.tar.xz"; - sha256 = "120f716wl7ay33yshicl1l0w62b9jx16ik3qnyh4ajwj8clyhx1v"; + url = "mirror://xorg/individual/lib/libX11-1.8.12.tar.xz"; + sha256 = "16lspc3bw2pg3jal7zyq6mxmxmmaax0fz6lgh1n4skqjn2dny0ps"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 90ad945d7fda..df0524100a4c 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -172,7 +172,7 @@ mirror://xorg/individual/lib/libICE-1.1.2.tar.xz mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz mirror://xorg/individual/lib/libSM-1.2.5.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.11.tar.xz +mirror://xorg/individual/lib/libX11-1.8.12.tar.xz mirror://xorg/individual/lib/libXau-1.0.12.tar.xz mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz From ec881d4134766b0553293391211a5d4381c64c4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Mar 2025 19:07:03 +0000 Subject: [PATCH 138/348] fast-float: 8.0.0 -> 8.0.1 --- pkgs/by-name/fa/fast-float/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index edebd6278d60..9ecdb4239114 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-shP+me3iqTRrsPGYrvcbnJNRZouQbW62T24xfkEgGSE="; + hash = "sha256-Y13JdBk8pZyg748fEOj+O/6gMAaqNXIE2fLY5tsMGB0="; }; nativeBuildInputs = [ cmake ]; From ce1cb6327a2e7f2f9ff41448c3b3861701d63529 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 11 Mar 2025 06:32:44 +0000 Subject: [PATCH 139/348] xorg.xtrans: 1.5.2 -> 1.6.0 Changes: https://lists.x.org/archives/xorg-announce/2025-March/003588.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ec00bd98bf0d..27c645a9953e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4363,11 +4363,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xtrans = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xtrans"; - version = "1.5.2"; + version = "1.6.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/xtrans-1.5.2.tar.xz"; - sha256 = "0v7qvys42md6nvm16xynhb3b8zz534fc60wg0hfi7ab48zivyp2w"; + url = "mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz"; + sha256 = "14ly6m6ww8rl45fdmlf58m0l1ihfji936ncx7lbiligjdcbfmbzs"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 90ad945d7fda..7ca2b12c1e59 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -207,7 +207,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz -mirror://xorg/individual/lib/xtrans-1.5.2.tar.xz +mirror://xorg/individual/lib/xtrans-1.6.0.tar.xz mirror://xorg/individual/proto/xcb-proto-1.17.0.tar.xz mirror://xorg/individual/proto/xorgproto-2024.1.tar.xz mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz From adad17e2d0398246717bcdd8a57d6f735fd3df2c Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Mar 2025 15:40:32 +0800 Subject: [PATCH 140/348] stdenv: fix propagatedUserEnvPkgs when __structuredAttrs is true Previously, when __structuredAttrs is true, only the first element of propagatedUserEnvPkgs was written to $out/nix-support/propagated-user-env-packages. --- pkgs/stdenv/generic/builder.sh | 2 +- pkgs/stdenv/generic/setup.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 2d8d784982a8..991cb4379511 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -19,5 +19,5 @@ mkdir $out # in stdenv. mkdir $out/nix-support if [ "$propagatedUserEnvPkgs" ]; then - printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages + printf '%s ' "${propagatedUserEnvPkgs[@]}" > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 958fc54f277f..e37134e98ced 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1644,8 +1644,7 @@ fixupPhase() { if [ -n "${propagatedUserEnvPkgs:-}" ]; then mkdir -p "${!outputBin}/nix-support" - # shellcheck disable=SC2086 - printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages" + printWords "${propagatedUserEnvPkgs[@]}" > "${!outputBin}/nix-support/propagated-user-env-packages" fi runHook postFixup From 009de0667f91d4bd46fe5a2aa70d8e1f325291da Mon Sep 17 00:00:00 2001 From: Daniel Barter Date: Sat, 1 Mar 2025 11:56:07 -0800 Subject: [PATCH 141/348] rust: re add setEnv to cargo build hooks --- pkgs/build-support/rust/hooks/cargo-build-hook.sh | 2 +- pkgs/build-support/rust/hooks/cargo-check-hook.sh | 2 +- pkgs/build-support/rust/hooks/default.nix | 5 +++++ pkgs/build-support/rust/hooks/maturin-build-hook.sh | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index d372d3a3f9d3..f0e155633503 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -38,7 +38,7 @@ cargoBuildHook() { concatTo flagsArray cargoBuildFlags echoCmd 'cargoBuildHook flags' "${flagsArray[@]}" - cargo build "${flagsArray[@]}" + @setEnv@ cargo build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index ee07b0f86512..241061e7c7ba 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -37,7 +37,7 @@ cargoCheckHook() { concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray echoCmd 'cargoCheckHook flags' "${flagsArray[@]}" - cargo test "${flagsArray[@]}" + @setEnv@ cargo test "${flagsArray[@]}" if [[ -n "${buildAndTestSubdir-}" ]]; then popd diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 76baa7d18168..21278ec382d1 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -27,6 +27,8 @@ name = "cargo-build-hook.sh"; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; passthru.tests = { @@ -44,6 +46,7 @@ name = "cargo-check-hook.sh"; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; }; passthru.tests = { @@ -136,6 +139,8 @@ ]; substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; + inherit (rust.envVars) setEnv; + }; } ./maturin-build-hook.sh ) { }; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 2039339fc80c..77972c2fe171 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -31,7 +31,7 @@ maturinBuildHook() { concatTo flagsArray maturinBuildFlags echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" - maturin build "${flagsArray[@]}" + @setEnv@ maturin build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd From ba49db003e4e9ecb43d737d75bb9402d25d102e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 04:00:43 +0100 Subject: [PATCH 142/348] python313Packages.setuptools: 75.8.0 -> 75.8.2 https://setuptools.pypa.io/en/stable/history.html#v75-8-2 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index bc4bb700a9f9..c4ffa9e95b14 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "75.8.0"; + version = "75.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; tag = "v${version}"; - hash = "sha256-dSzsj0lnsc1Y+D/N0cnAPbS/ZYb+qC41b/KfPmL1zI4="; + hash = "sha256-nD6c2JOjBL/SfgNchBlNasuwnrRl6XIuppjOt6Hr7CE="; }; patches = [ From 9748434b0b3de15d760cf1da9487c626c742da85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 04:10:39 +0100 Subject: [PATCH 143/348] python313Packages.pytest: 8.3.4 -> 8.3.5 https://github.com/pytest-dev/pytest/releases/tag/8.3.5 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 44d6ba780ea2..97be4c03335e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.3.4"; + version = "8.3.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-llNw0GK84R5zho4DNausMbTT3g6C9AB0CNJCtPhhB2E="; + hash = "sha256-9O/nDMFOURVlrEdrV8J54SqFWxH0jyEq8QgO8iY9OEU="; }; outputs = [ From ed998d7134757f26af510fe93099dc22424df0e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 04:13:27 +0100 Subject: [PATCH 144/348] python313Packages.pytest-asyncio: 0.25.2 -> 0.25.3 https://github.com/pytest-dev/pytest-asyncio/blob/v0.25.3/docs/reference/changelog.rst --- pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 82b18bc8869c..7950aaf6e921 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.25.2"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "0.25.3"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pytest-asyncio"; tag = "v${version}"; - hash = "sha256-GLKcqf6NXCMNU/lVLQP8s/FDC1OcpPF1RxzKDItJSiU="; + hash = "sha256-/uG8/uhKYeWrXifAJ7iqvpgXe70YduiqH8FSq2rD7f0="; }; outputs = [ From 583c6ccbc855c0f54723262584e5535dc354df06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 04:36:42 +0100 Subject: [PATCH 145/348] python313Packages.hypothesis: 6.125.2 -> 6.127.4 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-127-4 --- pkgs/development/python-modules/hypothesis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index ceb79e3d04a0..8abf7a6543de 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.125.2"; + version = "6.127.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-W+rTh9ymJTvq7KA4w8YrG6Z10tcfrtKGJ1MW716nVHs="; + hash = "sha256-Ef0DbK2+HnU94F2TxcotJEt3rcIU/QOhStLOUTn7o2k="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -51,9 +51,9 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ attrs sortedcontainers ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; From 6a9b500027102d7918fe68da5898688246ab7445 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 04:56:11 +0100 Subject: [PATCH 146/348] python313Packages.mypy: 1.14.1 -> 1.15.0 https://github.com/python/mypy/blob/refs/tags/v1.15.0/CHANGELOG.md --- pkgs/development/python-modules/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 780a3ce968dd..1ffadd2005f6 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.14.1"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; tag = "v${version}"; - hash = "sha256-Ha7icLFc4BL7a3NECcwX4dtWmkXctANCqu/IbrEnmjw="; + hash = "sha256-y67kt5i8mT9TcSbUGwnNuTAeqjy9apvWIbA2QD96LS4="; }; passthru.updateScript = gitUpdater { From 3f2403435ab47665287af5d883a848ac6a170281 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 06:35:07 +0100 Subject: [PATCH 147/348] python313Packages.roman-numerals-py: init at 3.1.0 --- .../roman-numerals-py/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/roman-numerals-py/default.nix diff --git a/pkgs/development/python-modules/roman-numerals-py/default.nix b/pkgs/development/python-modules/roman-numerals-py/default.nix new file mode 100644 index 000000000000..5a2b5008b350 --- /dev/null +++ b/pkgs/development/python-modules/roman-numerals-py/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pytestCheckHook, + sphinx, +}: + +buildPythonPackage rec { + pname = "roman-numerals-py"; + version = "3.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AA-Turner"; + repo = "roman-numerals"; + tag = "v${version}"; + hash = "sha256-YLF09jYwXq48iMvmqbj/cocYJPp7RsCXzbN0DV9gpis="; + }; + + postPatch = '' + ls -lah + cp LICENCE.rst python/ + + cd python + ''; + + build-system = [ flit-core ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "roman_numerals" ]; + + meta = { + description = "Manipulate roman numerals"; + homepage = "https://github.com/AA-Turner/roman-numerals/"; + changelog = "https://github.com/AA-Turner/roman-numerals/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.cc0; + maintainers = sphinx.meta.maintainers; + mainProgram = "roman-numerals-py"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03cb6209507a..9c932905bf16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14606,6 +14606,8 @@ self: super: with self; { roma = callPackage ../development/python-modules/roma { }; + roman-numerals-py = callPackage ../development/python-modules/roman-numerals-py { }; + roman = callPackage ../development/python-modules/roman { }; romy = callPackage ../development/python-modules/romy { }; From 98d5fce8e029a9a6bebad80a2113cf0cb7d07c5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 06:40:43 +0100 Subject: [PATCH 148/348] python313Packages.sphinx: 8.1.3 -> 8.2.3 https://www.sphinx-doc.org/en/master/changes/8.2.html#release-8-2-3-released-mar-02-2025 --- .../python-modules/sphinx/default.nix | 20 +- .../sphinx/pygments-2.19-compat.patch | 213 ------------------ 2 files changed, 10 insertions(+), 223 deletions(-) delete mode 100644 pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 2f951573b860..e578f401e936 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -19,6 +19,7 @@ packaging, pygments, requests, + roman-numerals-py, snowballstemmer, sphinxcontrib-applehelp, sphinxcontrib-devhelp, @@ -43,10 +44,10 @@ buildPythonPackage rec { pname = "sphinx"; - version = "8.1.3"; + version = "8.2.3"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "sphinx-doc"; @@ -59,14 +60,9 @@ buildPythonPackage rec { mv tests/roots/test-images/{testimäge,testimæge}.png sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; - hash = "sha256-AObNQz2gKoPHfvC5aoefynXfQMe3bnQpEx6KrLNQBoQ="; + hash = "sha256-FoyCpDGDKNN2GMhE7gDpJLmWRWhbMCYlcVEaBTfXSEw="; }; - patches = [ - # https://github.com/sphinx-doc/sphinx/commit/5ff3740063c1ac57f17ecd697bcd06cc1de4e75c - ./pygments-2.19-compat.patch - ]; - build-system = [ flit-core ]; dependencies = @@ -79,6 +75,7 @@ buildPythonPackage rec { packaging pygments requests + roman-numerals-py snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp @@ -132,8 +129,11 @@ buildPythonPackage rec { "test_cython" # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" - # https://github.com/sphinx-doc/sphinx/issues/13223 - "test_html_multi_line_copyright" + # ModuleNotFoundError: No module named 'fish_licence.halibut' + "test_import_native_module_stubs" + # Racy tex file creation + "test_literalinclude_namedlink_latex" + "test_literalinclude_caption_latex" ] ++ lib.optionals (pythonAtLeast "3.12") [ # https://github.com/sphinx-doc/sphinx/issues/12430 diff --git a/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch b/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch deleted file mode 100644 index 37330e0f1f06..000000000000 --- a/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch +++ /dev/null @@ -1,213 +0,0 @@ -diff --git a/tests/test_builders/test_build_html_code.py b/tests/test_builders/test_build_html_code.py -index d32c0b3e2..02684b22e 100644 ---- a/tests/test_builders/test_build_html_code.py -+++ b/tests/test_builders/test_build_html_code.py -@@ -1,3 +1,6 @@ -+from __future__ import annotations -+ -+import pygments - import pytest - - -@@ -32,11 +35,16 @@ def test_html_codeblock_linenos_style_inline(app): - - @pytest.mark.sphinx('html', testroot='reST-code-role') - def test_html_code_role(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - content = (app.outdir / 'index.html').read_text(encoding='utf8') - - common_content = ( -- 'def foo' -+ f'def{sp}foo' - '(' - '1 ' - '+ ' -diff --git a/tests/test_builders/test_build_latex.py b/tests/test_builders/test_build_latex.py -index ea6dc7475..6ba2a375c 100644 ---- a/tests/test_builders/test_build_latex.py -+++ b/tests/test_builders/test_build_latex.py -@@ -8,6 +8,7 @@ from pathlib import Path - from shutil import copyfile - from subprocess import CalledProcessError - -+import pygments - import pytest - - from sphinx.builders.latex import default_latex_documents -@@ -2127,12 +2128,16 @@ def test_latex_container(app): - - @pytest.mark.sphinx('latex', testroot='reST-code-role') - def test_latex_code_role(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = r'\PYG{+w}{ }' -+ else: -+ sp = ' ' -+ - app.build() - content = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8') - - common_content = ( -- r'\PYG{k}{def} ' -- r'\PYG{n+nf}{foo}' -+ r'\PYG{k}{def}' + sp + r'\PYG{n+nf}{foo}' - r'\PYG{p}{(}' - r'\PYG{l+m+mi}{1} ' - r'\PYG{o}{+} ' -diff --git a/tests/test_directives/test_directive_code.py b/tests/test_directives/test_directive_code.py -index 65e16b805..2876dbc05 100644 ---- a/tests/test_directives/test_directive_code.py -+++ b/tests/test_directives/test_directive_code.py -@@ -2,6 +2,7 @@ - - import os.path - -+import pygments - import pytest - from docutils import nodes - -@@ -393,6 +394,11 @@ def test_literal_include_block_start_with_comment_or_brank(app): - - @pytest.mark.sphinx('html', testroot='directive-code') - def test_literal_include_linenos(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build(filenames=[app.srcdir / 'linenos.rst']) - html = (app.outdir / 'linenos.html').read_text(encoding='utf8') - -@@ -410,7 +416,7 @@ def test_literal_include_linenos(app): - - # :lines: 5-9 - assert ( -- '5class ' -+ f'5class{sp}' - 'Foo:' - ) in html - -@@ -560,12 +566,17 @@ def test_code_block_highlighted(app): - - @pytest.mark.sphinx('html', testroot='directive-code') - def test_linenothreshold(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build(filenames=[app.srcdir / 'linenothreshold.rst']) - html = (app.outdir / 'linenothreshold.html').read_text(encoding='utf8') - - # code-block using linenothreshold - assert ( -- '1class ' -+ f'1class{sp}' - 'Foo:' - ) in html - -diff --git a/tests/test_extensions/test_ext_viewcode.py b/tests/test_extensions/test_ext_viewcode.py -index eeef391c1..996db00fd 100644 ---- a/tests/test_extensions/test_ext_viewcode.py -+++ b/tests/test_extensions/test_ext_viewcode.py -@@ -6,6 +6,7 @@ import re - import shutil - from typing import TYPE_CHECKING - -+import pygments - import pytest - - if TYPE_CHECKING: -@@ -13,6 +14,11 @@ if TYPE_CHECKING: - - - def check_viewcode_output(app: SphinxTestApp) -> str: -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - warnings = re.sub(r'\\+', '/', app.warning.getvalue()) - assert re.findall( - r"index.rst:\d+: WARNING: Object named 'func1' not found in include " -@@ -41,7 +47,7 @@ def check_viewcode_output(app: SphinxTestApp) -> str: - '[docs]\n' - ) in result - assert '@decorator\n' in result -- assert 'class Class1:\n' in result -+ assert f'class{sp}Class1:\n' in result - assert ' """\n' in result - assert ' this is Class1\n' in result - assert ' """\n' in result -diff --git a/tests/test_highlighting.py b/tests/test_highlighting.py -index 430d569c0..2d08162aa 100644 ---- a/tests/test_highlighting.py -+++ b/tests/test_highlighting.py -@@ -10,7 +10,8 @@ from pygments.token import Name, Text - - from sphinx.highlighting import PygmentsBridge - --if tuple(map(int, pygments.__version__.split('.')))[:2] < (2, 18): -+ -+if tuple(map(int, pygments.__version__.split('.')[:2])) < (2, 18): - from pygments.formatter import Formatter - - Formatter.__class_getitem__ = classmethod(lambda cls, name: cls) # type: ignore[attr-defined] -diff --git a/tests/test_intl/test_intl.py b/tests/test_intl/test_intl.py -index 6f343e03d..9125612af 100644 ---- a/tests/test_intl/test_intl.py -+++ b/tests/test_intl/test_intl.py -@@ -10,6 +10,7 @@ import shutil - import time - from io import StringIO - -+import pygments - import pytest - from babel.messages import mofile, pofile - from babel.messages.catalog import Catalog -@@ -1473,6 +1474,11 @@ def test_xml_strange_markup(app): - @pytest.mark.sphinx('html', testroot='intl') - @pytest.mark.test_params(shared_result='test_intl_basic') - def test_additional_targets_should_not_be_translated(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - # [literalblock.txt] - result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') -@@ -1511,7 +1517,7 @@ def test_additional_targets_should_not_be_translated(app): - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ -- """import sys """ -+ f"""import{sp}sys """ - """# sys importing""" - ) - assert_count(expected_expr, result, 1) -@@ -1556,6 +1562,11 @@ def test_additional_targets_should_not_be_translated(app): - }, - ) - def test_additional_targets_should_be_translated(app): -+ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): -+ sp = ' ' -+ else: -+ sp = ' ' -+ - app.build() - # [literalblock.txt] - result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') -@@ -1605,7 +1616,7 @@ def test_additional_targets_should_be_translated(app): - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ -- """import sys """ -+ f"""import{sp}sys """ - """# SYS IMPORTING""" - ) - assert_count(expected_expr, result, 1) From 332c4d0b7a79a84d6167a472fd5318bd0a97da57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 06:43:42 +0100 Subject: [PATCH 149/348] python313Packages.sphinx-autodoc-typehints: 3.0.1 -> 3.1.0 https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/3.1.0 --- .../python-modules/sphinx-autodoc-typehints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 827a9dc29813..a3cb24baa9c5 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -11,7 +11,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "3.0.1"; + version = "3.1.0"; in buildPythonPackage { @@ -23,7 +23,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-ubQN0V3uVPb4EMkk+GP5zxxU+fMmXElRQOoBvn9E+lU="; + hash = "sha256-prewtt8KOAeDzlspFQwtMDUnRvAno+KU03GDmV0/I+0="; }; pythonRelaxDeps = [ "sphinx" ]; From d88d9feeb4bfc1bf6837037903c0f28c6f1d06fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 07:13:54 +0100 Subject: [PATCH 150/348] python313Packages.certifi: 2024.12.14 -> 2025.01.31 https://github.com/certifi/python-certifi/compare/2024.12.14...2025.01.31 --- pkgs/development/python-modules/certifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 6fb12a08ee81..a125dc86da39 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2024.12.14"; + version = "2025.01.31"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-VXkgMqS+uDuKv/6VIfLwfTcYhupQtyB8g2q0NkkukYI="; + hash = "sha256-LHoFI9+vrrrRzyhWNchQYp4AAiFcQwZHdeNzMjTJ8jk="; }; patches = [ From be4d27febe7776aac010f1ce11e1ff1f60f09bdd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:03:43 +0100 Subject: [PATCH 151/348] python313Packages.pip: 24.0 -> 25.0.1 https://pip.pypa.io/en/stable/news/#v25-0-1 --- pkgs/development/python-modules/pip/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index eb946a955c67..fb3cce10c235 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,6 +10,7 @@ # docs sphinx, + sphinx-issues, # checks freezegun, @@ -30,14 +31,14 @@ let self = buildPythonPackage rec { pname = "pip"; - version = "24.0"; + version = "25.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; tag = version; - hash = "sha256-yojk2T5wuPkS1OKusilj253AT+xyKwXCWKBNUEH2Mgo="; + hash = "sha256-V069rAL6U5KBnSc09LRCu0M7qQCH5NbMghVttlmIoRY="; }; postPatch = '' @@ -53,6 +54,7 @@ let # docs sphinx + sphinx-issues ]; outputs = [ @@ -69,7 +71,7 @@ let # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug # sphinxcontrib.towncrier is not currently packaged for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do - substituteInPlace html/conf.py --replace '"'$ext'",' "" + substituteInPlace html/conf.py --replace-fail '"'$ext'",' "" done PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ From 5f4ed45be07c98c0cda45df5679d08adc4bce01a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:09:43 +0100 Subject: [PATCH 152/348] python313Packages.importlib-metadata: 8.5.0 -> 8.6.1 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index c4272412d087..3e1cc903fd56 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "8.5.0"; + version = "8.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-cVImVvCrrOHQcrnlSBpI8HwTjgDwecOMj4g4I/nCa9c="; + hash = "sha256-MQtB11VEXXRWn5k8z8IoOCldn+AFQlCU+tlT1/FchYA="; }; build-system = [ From 8b20103d797d4993640b8343549864a981617edf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:10:28 +0100 Subject: [PATCH 153/348] python313Packages.attrs: 24.3.0 -> 25.1.0 https://github.com/python-attrs/attrs/releases/tag/25.1.0 --- pkgs/development/python-modules/attrs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index f8824a6fef31..2781a4bfb978 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "attrs"; - version = "24.3.0"; + version = "25.1.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-j1wHMz1UMQNUG6e+Dizhbu7oEwyws/kjirkEzh6Fuv8="; + hash = "sha256-HJcHioDIFCc6drKimKky62gch0FcEd7gppId5/GwLD4="; }; patches = [ From 1ea433e847733cd767737fc6d02edfe32384e34c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:15:43 +0100 Subject: [PATCH 154/348] python313Packages.pytz: 2024.2 -> 2025.1 https://launchpad.net/pytz/+announcements --- pkgs/development/python-modules/pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 2d69cfdb0cfb..bf3397672538 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytz"; - version = "2024.2"; + version = "2025.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KqNVCDxQoPk/pYFwnerAya1lzKip6b6sZgrcvUk8eYo="; + hash = "sha256-wttCviolGLKOZfkgfE0F5v9UfR76QIZGnvhV5KtwF44="; }; build-system = [ setuptools ]; From 937557eedc22385a61ee84149d862f69f38f859e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:16:20 +0100 Subject: [PATCH 155/348] python313Packages.cachetools: 5.5.0 -> 5.5.2 https://github.com/tkem/cachetools/blob/v5.5.2/CHANGELOG.rst --- pkgs/development/python-modules/cachetools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 93561a2d194e..4411b9c91bf1 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.5.0"; + version = "5.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tkem"; repo = "cachetools"; tag = "v${version}"; - hash = "sha256-WG9PiUMVGaEXXHKbtOFEGjLiSbNnpSI2fXCogpGj1PI="; + hash = "sha256-CWgl2UW7+rBXRQ6N/QY3vJiLsrPfmplmQbxPp2vcdU0="; }; build-system = [ setuptools ]; From b4a8330f5e260b7d08e3dff64a01e9f70b5a38b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:17:44 +0100 Subject: [PATCH 156/348] python313Packages.time-machine: 2.15.0 -> 2.16.0 https://github.com/adamchainz/time-machine/blob/refs/tags/2.16.0/CHANGELOG.rst --- pkgs/development/python-modules/time-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 6794870e32d1..b7d5585e8617 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "time-machine"; tag = version; - hash = "sha256-0WYmkrMMeCkBYxy2qGovdxftzrYW9x/3tdeBcYC47Z0="; + hash = "sha256-xNoLtgON1dfKAgK0XhSMLHLsUr/nST3lepy15YWDEcE="; }; build-system = [ setuptools ]; From 13186352e192e39b9b25db54cb40e78f268acd63 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:17:54 +0100 Subject: [PATCH 157/348] python313Packages.setuptools-scm: 8.1.0 -> 8.2.0 https://github.com/pypa/setuptools_scm/blob/8.2.0/CHANGELOG.md --- pkgs/development/python-modules/setuptools-scm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index cc82356de85a..9ce94f6c964f 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "8.1.0"; + version = "8.2.0"; pyproject = true; src = fetchPypi { pname = "setuptools_scm"; inherit version; - hash = "sha256-Qt6htldxy6k7elFdZaZdgkblYHaKZrkQalksjn8myKc="; + hash = "sha256-oYOWobwCGcl00adGErEfnc4NW9ix3FXGX2rH/WCejCg="; }; build-system = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; From 026f3aee65e21674b3000893b5f083f20c957a93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:18:27 +0100 Subject: [PATCH 158/348] python313Packages.virtualenv: 20.29.1 -> 20.29.2 https://github.com/pypa/virtualenv/blob/20.29.2/docs/changelog.rst --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 51670c928404..1b428a61e764 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.29.1"; + version = "20.29.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uLiXATjTL7YGGSy5f2zUu2RPpIa+kwj7m2P4EJG13DU="; + hash = "sha256-/aq+v20DtbqDrgoCz+lvSKcW9PrlVkYdGAglhm91tyg="; }; nativeBuildInputs = [ From 4d1866c64d69618143506e3abe934007637f3b61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:21:30 +0100 Subject: [PATCH 159/348] python313Packages.tomli: 2.0.1 -> 2.2.1 https://github.com/hukkin/tomli/compare/2.0.1...2.2.1 --- pkgs/development/python-modules/tomli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 20ae66d60fcd..ea17a226873e 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tomli"; - version = "2.0.1"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "hukkin"; repo = pname; rev = version; - hash = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA="; + hash = "sha256-4MWp9pPiUZZkjvGXzw8/gDele743NBj8uG4jvK2ohUM="; }; nativeBuildInputs = [ flit-core ]; From 9f37eafb7603ec0ff196e0870b8618468d952029 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:22:48 +0100 Subject: [PATCH 160/348] python313Packages.psutil: 6.1.1 -> 7.0.0 https://github.com/giampaolo/psutil/blob/release-7.0.0/HISTORY.rst --- pkgs/development/python-modules/psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 4e1cbc07fd08..84a994cc2d61 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "psutil"; - version = "6.1.1"; + version = "7.0.0"; pyproject = true; inherit stdenv; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-z4SWcowY8tC0UZjwaJW+UvNmEXEXRrfzDEZLQitQ4vU="; + hash = "sha256-e+nD66OL7Mtkleozr9mCpEB0t48oxDSh9RzAf9MVxFY="; }; postPatch = '' From df51ae20e1ba0394e029d453c28a3d744db85c2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:46:24 +0100 Subject: [PATCH 161/348] python313Packages.lxml: 5.3.0 -> 5.3.1 https://github.com/lxml/lxml/blob/lxml-5.3.1/CHANGES.txt --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 87a225095f66..f3f520f6ffb8 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml"; tag = "lxml-${version}"; - hash = "sha256-xhKtqsh5FfgXt1fKUhN/Aib/004P7epArv3/XxDSBtw="; + hash = "sha256-TGv2ZZQ7GU+fAWRApESUL1bbxQobbmLai8wr09xYOUw="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs From cc240a69766af79794eabb26a78a47c5e469f90c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:58:06 +0100 Subject: [PATCH 162/348] python313Packages.wrapt: 1.17.1 -> 1.17.2 https://github.com/GrahamDumpleton/wrapt/compare/refs/tags/1.17.1...1.17.2 --- pkgs/development/python-modules/wrapt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index e355d96aa9bd..46cdbd4f9071 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.17.1"; + version = "1.17.2"; pyproject = true; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "wrapt"; tag = version; - hash = "sha256-k1OuGzUFF2gRsx3xrJ5/YwpXB6ksK0TsaZq6x3+ckf0="; + hash = "sha256-QduT5bncXi4LeI034h5Pqtwybru0QcQIYI7cMchLy7c="; }; build-system = [ setuptools ]; From 3244adf50946526f208b0b053cbade08ed64afa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 08:58:11 +0100 Subject: [PATCH 163/348] python313Packages.filelock: 3.16.1 -> 3.17.0 https://github.com/tox-dev/py-filelock/releases/tag/3.17.0 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 3aa7faeae458..d5d16efaeb01 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.16.1"; + version = "3.17.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wkn7/NXbR+Xi1tYhmOVlR17mXkgx4lYcjjE/p+uWFDU="; + hash = "sha256-7k53QB71duuzjNfxO5soiTGUrMIKjmjhhzC6nA5UZg4="; }; build-system = [ From b226f2c70d23732a1b73aaf88e4cd8ada4963b93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 09:25:10 +0100 Subject: [PATCH 164/348] python313Packages.beautifulsoup4: 4.12.3 -> 4.13.3 https://git.launchpad.net/beautifulsoup/tree/CHANGELOG?h=4.13.3 --- .../python-modules/beautifulsoup4/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index a0fbb4ade834..c04050c54d81 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, chardet, hatchling, html5lib, @@ -11,6 +10,7 @@ pythonOlder, soupsieve, sphinxHook, + typing-extensions, # for passthru.tests html-sanitizer, @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.12.3"; + version = "4.13.3"; pyproject = true; outputs = [ @@ -35,25 +35,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-dOPRko7cBw0hdIGFxG4/szSQ8i9So63e6a7g9Pd4EFE="; + hash = "sha256-G9MkBdrMkgtCuDugFkR0ftd0VqZXYOKF+8R2M87dr4s="; }; - patches = [ - (fetchpatch { - name = "tests.patch"; - url = "https://git.launchpad.net/beautifulsoup/patch/?id=9786a62726de5a8caba10021c4d4a58c8a3e9e3f"; - hash = "sha256-FOMoJjT0RgqKjbTLN/qCuc0HjhKeenMcgwb9Fp8atAY="; - }) - ]; + build-system = [ hatchling ]; - nativeBuildInputs = [ - hatchling - sphinxHook - ]; + nativeBuildInputs = [ sphinxHook ]; - propagatedBuildInputs = [ + dependencies = [ chardet soupsieve + typing-extensions ]; optional-dependencies = { @@ -63,7 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "bs4" ]; From 20bd11e13dff20183ffd007e659948df518b67ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 09:25:29 +0100 Subject: [PATCH 165/348] python313Packages.deprecated: 1.2.15 -> 1.2.18 https://github.com/tantale/deprecated/compare/refs/tags/v1.2.15...v1.2.18 --- .../python-modules/deprecated/default.nix | 9 ++------- .../deprecated/sphinx8-compat.patch | 17 ----------------- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/deprecated/sphinx8-compat.patch diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 4c2d6b1b2b95..b330d700489a 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deprecated"; - version = "1.2.15"; + version = "1.2.18"; pyproject = true; outputs = [ @@ -23,14 +23,9 @@ buildPythonPackage rec { owner = "tantale"; repo = "deprecated"; tag = "v${version}"; - hash = "sha256-slMPL2L0TZ7L19nfHMOM4jQlkJ7HIyyDPlfC9yhhd98="; + hash = "sha256-gx5D1KAPELKfb2U93lvuztv3Ea3V+PshcfshIS6uwCo="; }; - patches = [ - # https://github.com/laurent-laporte-pro/deprecated/pull/79 - ./sphinx8-compat.patch - ]; - build-system = [ setuptools ]; nativeBuildInputs = [ sphinxHook ]; diff --git a/pkgs/development/python-modules/deprecated/sphinx8-compat.patch b/pkgs/development/python-modules/deprecated/sphinx8-compat.patch deleted file mode 100644 index 7e8a7801efdf..000000000000 --- a/pkgs/development/python-modules/deprecated/sphinx8-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/docs/source/conf.py b/docs/source/conf.py -index bed3b95..bd81db5 100644 ---- a/docs/source/conf.py -+++ b/docs/source/conf.py -@@ -173,9 +173,9 @@ texinfo_documents = [ - - # Example configuration for intersphinx: refer to the Python standard library. - intersphinx_mapping = { -- 'https://docs.python.org/3/': None, -- 'https://wrapt.readthedocs.io/en/latest/': None, -- 'http://flask.pocoo.org/docs/1.0/': None, -+ 'python': ('https://docs.python.org/3/', None), -+ 'wrapt': ('https://wrapt.readthedocs.io/en/latest/', None), -+ 'flask': ('http://flask.pocoo.org/docs/1.0/', None), - 'django': ('https://docs.djangoproject.com/en/2.1/', 'https://docs.djangoproject.com/en/2.1/_objects/'), - } - From 0f577e57fe3f6f986525382c38f291ec0d50459f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 09:33:32 +0100 Subject: [PATCH 166/348] python313Packages.trove-classifiers: 2025.1.15.22 -> 2025.2.18.16 https://github.com/pypa/trove-classifiers/releases/tag/2025.2.18.16 --- pkgs/development/python-modules/trove-classifiers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index c39c058b8aca..731a34a513b9 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,7 +11,7 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2025.1.15.22"; + version = "2025.2.18.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-kK90NY06AbNTK8ezyI2MaglML9UKVj0T2VdheTJtftk="; + hash = "sha256-se4uFmhYkhfU7fUGdD4osYNNoSj4oSK61SLALYNwBuE="; }; build-system = [ From 4065c9c05a6747f11362a8cb688b1e27b50b8e81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 09:37:55 +0100 Subject: [PATCH 167/348] python313Packages.babel: 2.16.0 -> 2.17.0 https://github.com/python-babel/babel/releases/tag/v2.17.0 --- pkgs/development/python-modules/babel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 0499c1f52c94..e8ee122cde0c 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "babel"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0fNVTKJmBf4XPz3gxl91D1pC+SRJm/E03mQjWCKY4xY="; + hash = "sha256-DFTP+xn2kM3MUqO1C8v3HgeoCNHIDVSfJFm50s8K+50="; }; build-system = [ setuptools ]; From 38db15dae68c5dea765c3ca60b91328d527d5d54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 09:38:41 +0100 Subject: [PATCH 168/348] python313Packages.mako: 1.3.8 -> 1.3.9 https://docs.makotemplates.org/en/latest/changelog.html --- pkgs/development/python-modules/mako/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 4c2f7ae8c5f3..f2d95cfff5d3 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, isPyPy, # build-system @@ -25,7 +23,7 @@ buildPythonPackage rec { pname = "mako"; - version = "1.3.8"; + version = "1.3.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,17 +32,9 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "mako"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-7KttExqHxv//q8ol7eOFIrgRHbQySQTvL7Rd9VooX0Y="; + hash = "sha256-BC1PSmMG9KzD+w8tDUW9WXJS25HNsELgwDpkTHYO9j0="; }; - patches = [ - (fetchpatch { - name = "float-precision.patch"; - url = "https://github.com/sqlalchemy/mako/commit/188d5431a5c93b937da03e70c4c2c8c42cd9a502.patch"; - hash = "sha256-/ROS6WkSqYXJsX6o1AejUg/faS3lUAimrRJzS74Bwws="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ markupsafe ]; From bbe314131a1272871a5e61b3b59fc96bbfd88f18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 10:00:56 +0100 Subject: [PATCH 169/348] python313Packages.alembic: 1.14.0 -> 1.14.1 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4cc93413c77f..41c124768b13 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sAiStTs2QtC42+26I02/GSS2m+g6mnadWmJLAQlOMEs="; + hash = "sha256-SW6IgkWlOt8UmPyrMXE6Rpxlg2+N524BOZqhw+kN0hM="; }; build-system = [ setuptools ]; From 152243bd66b6b821dbdd3e4fc051be5bca134e71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:01:03 +0100 Subject: [PATCH 170/348] python313Packages.rpds-py: 0.22.3 -> 0.23.1 https://github.com/crate-py/rpds/releases/tag/v0.23.1 --- pkgs/development/python-modules/rpds-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 8db7f97929bb..297f76820a11 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.22.3"; + version = "0.23.1"; pyproject = true; src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-4y/uirRdPC222hmlMjvDNiI3yLZTxwGUQUuJL9BqCA0="; + hash = "sha256-fzJA3PoU0ZjbokuLnLOxCMBraNRbe6vZ7vwQOP335wc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2skrDC80g0EKvTEeBI4t4LD7ZXb6jp2Gw+owKFrkZzc="; + hash = "sha256-Iq8uthR4k+NN8hCwWLBW1kLNZ0Pvwz1xMDT6zHcIPb8="; }; nativeBuildInputs = [ From e160c584c2df3e39100165dcfe4c8351b9d32412 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:01:21 +0100 Subject: [PATCH 171/348] python313Packages.bcrypt: 4.2.1 -> 4.3.0 --- pkgs/development/python-modules/bcrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index a8ed1cac5987..2c46f8599ff6 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.2.1"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Z2U4bjq4f1abJ2mIdCA5uqsIeyzbAegJ1050UDwvqv4="; + hash = "sha256-Oj/SIEF4ttKtzwnLT2Qm/+9UdiV3p8m1TBWQCMsojBg="; }; cargoRoot = "src/_bcrypt"; @@ -36,7 +36,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-tCeXgypF5Tqnzv7KfoliUZeO6B83YK5cYORhwlvBVnY="; + hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA="; }; nativeBuildInputs = [ From 8688edad2a27dc3b550bf322dcced537093a0d3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:01:26 +0100 Subject: [PATCH 172/348] python313Packages.matplotlib: 3.10.0 -> 3.10.1 https://github.com/matplotlib/matplotlib/releases/tag/v3.10.1 --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index a8e2768f1fbd..9e520493597b 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -89,7 +89,7 @@ let in buildPythonPackage rec { - version = "3.10.0"; + version = "3.10.1"; pname = "matplotlib"; pyproject = true; @@ -97,7 +97,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-uIbQKlgblnBMnR/+VXCeSbTS1ScJzOvEvkLbhW5REng="; + hash = "sha256-6NLQ44gbEpJoWFv0dlrT7nOkWR13uaGMIUrH46efsro="; }; env.XDG_RUNTIME_DIR = "/tmp"; From 7eecad76a6a2347ef24be0ee0dc01c0b5a1c4a8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:02:41 +0100 Subject: [PATCH 173/348] python313Packages.cryptography: 44.0.1 -> 44.0.2 https://cryptography.io/en/latest/changelog/#v44-0-2 --- pkgs/development/python-modules/cryptography/default.nix | 6 +++--- pkgs/development/python-modules/cryptography/vectors.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index ec87fbe89d23..24041f83ea99 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "cryptography"; - version = "44.0.1"; # Also update the hash in vectors.nix + version = "44.0.2"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; @@ -33,13 +33,13 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-PM7InFrRY0ho8qcBcVqqcXV9eVP8fF0ma/y4C0gx1Ic="; + hash = "sha256-nXwW6v+U47/+CmjhREHcuQ7QQi/b26gagWBQ3F16DuQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-hjfSjmwd/mylVZKyXsj/pP2KvAGDpfthuT+w219HAiA="; + hash = "sha256-HbUsV+ABE89UvhCRZYXr+Q/zRDKUy+HgCVdQFHqaP4o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index d62321188676..0c9f40976766 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,10 +15,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-WphmsURl3PrxK837wzkph7tVnzesi4pMm2NZvno9fqA="; + hash = "sha256-qzLhVrbn6vbYxyejIkWWfczgSUhzAUgvyjjAxf3ITks="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; # No tests included doCheck = false; From a87265f0f0953b1dfddc3c4ade12594f990064c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:06:58 +0100 Subject: [PATCH 174/348] python313Packages.tzdata: 2024.2 -> 2025.1 --- pkgs/development/python-modules/tzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 7ef57e00a0e8..640592a71fc2 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2024.2"; + version = "2025.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fYXMQW6TguaQlbe99K/Z44gEGKJBP+7HBp1TPWtOMcw="; + hash = "sha256-JIlJCeiM2yi9FjbGiHgB32TLSFvVk/L9g+8pB1qB1pQ="; }; nativeBuildInputs = [ setuptools ]; From 858a016d041bca9976d3a74d1353cf21871cf327 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:16:42 +0100 Subject: [PATCH 175/348] python313Packages.referencing: 0.36.1 -> 0.36.2 https://github.com/python-jsonschema/referencing/releases/tag/v0.36.2 --- pkgs/development/python-modules/referencing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 55a29aed8458..2283c7758de9 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -16,7 +16,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.36.1"; + version = "0.36.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ let repo = "referencing"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-kMYn41tlBMPb2hMMwHg+o6sNrwp3CHRQwmBzQHsgG1I="; + hash = "sha256-VwViFiquacwJlELNDp01DRbtYQHOY4qXS2CjD7YmS6g="; }; build-system = [ From 11bcc653e7771077e64e9711b680ca8a029d6282 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:23:24 +0100 Subject: [PATCH 176/348] python313Packages.fastjsonschema: 2.19.1 -> 2.21.1 https://github.com/horejsek/python-fastjsonschema/compare/v2.19.1...v2.21.1 --- .../python-modules/fastjsonschema/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 4b518e5f8ef1..ad250ee1715c 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -3,15 +3,15 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.19.1"; - format = "setuptools"; + version = "2.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,21 +20,13 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-UxcxVB4ldnGAYJKWEccivon1CwZD588mNiVJOJPNeN8="; + hash = "sha256-H/jmvm5U4RB9KuD5EgCedbc499Fl8L2S9Y5SXy51JP0="; }; - patches = [ - (fetchpatch2 { - name = "fastjsonschema-pytest8-compat.patch"; - url = "https://github.com/horejsek/python-fastjsonschema/commit/efc04daf4124a598182dfcfd497615cd1e633d18.patch"; - hash = "sha256-G1/PIpdN+KFfRP9pUFf/ANXLq3mzrocEHyBNWQMVOZM="; - }) - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - disabledTests = [ "benchmark" @@ -46,10 +38,16 @@ buildPythonPackage rec { "test_compile_to_code_custom_format" # cannot import temporary module created during test ]; + pytestFlagsArray = [ + # fastjsonschema.exceptions.JsonSchemaDefinitionException: Unknown format uuid/duration + "--deselect=tests/json_schema/test_draft2019.py::test" + ]; + pythonImportsCheck = [ "fastjsonschema" ]; meta = with lib; { description = "JSON schema validator for Python"; + downloadPage = "https://github.com/horejsek/python-fastjsonschema"; homepage = "https://horejsek.github.io/python-fastjsonschema/"; license = licenses.bsd3; maintainers = with maintainers; [ drewrisinger ]; From 7fd19112e3cba2fdcc0c91249f2ce154e44a0996 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:30:08 +0100 Subject: [PATCH 177/348] python313Packages.myst-parser: 4.0.0 -> 4.0.1 https://raw.githubusercontent.com/executablebooks/MyST-Parser/v4.0.1/CHANGELOG.md --- .../python-modules/myst-parser/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index 681a73f05723..8e1ab236ac48 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, flit-core, pythonOlder, defusedxml, @@ -21,8 +20,8 @@ }: buildPythonPackage rec { pname = "myst-parser"; - version = "4.0.0"; - format = "pyproject"; + version = "4.0.1"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -30,17 +29,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; tag = "v${version}"; - hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978="; + hash = "sha256-/Prauz4zuJY39EK2BmgBbH1uwjF4K38e5X5hPYwRBl0="; }; - patches = [ - (fetchpatch2 { - # Sphinx 8.1 compat - url = "https://github.com/executablebooks/MyST-Parser/commit/9fe724ebf1d02fd979632d82387f802c91e0d6f6.patch"; - hash = "sha256-KkAV9tP+dFax9KuxqkhqNlGWx6wSO6M2dWpah+GYG0E="; - }) - ]; - build-system = [ flit-core ]; dependencies = [ @@ -63,9 +54,12 @@ buildPythonPackage rec { ] ++ markdown-it-py.optional-dependencies.linkify; disabledTests = [ - # sphinx 7.4 compat - "test_amsmath" - # pygments 2.19 compat + # sphinx 8.2 compat + # https://github.com/executablebooks/MyST-Parser/issues/1030 + "test_sphinx_directives" + "test_references_singlehtml" + "test_extended_syntaxes" + "test_fieldlist_extension" "test_includes" ]; From 3fc4086f6ddb196d0a1cebaa0ffed2da68f2a3ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:31:46 +0100 Subject: [PATCH 178/348] python313Packages.typeguard: 4.4.1 -> 4.4.2 https://github.com/agronholm/typeguard/releases/tag/4.4.2 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 69493dca3e5b..15d06f3946cc 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "typeguard"; - version = "4.4.1"; + version = "4.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DSKonQC0U7R8SYdfQrZgG5YXV1QaLh4O9Re24kITwhs="; + hash = "sha256-pvEGWBPjLvNlvDs/UDr4qW+d1OADOgLCjEpJg96MbEk="; }; outputs = [ From fd650affc705dd652d596da3b3558739e66503d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:33:10 +0100 Subject: [PATCH 179/348] python313Packages.prompt-toolkit: 3.0.48 -> 3.0.50 https://github.com/prompt-toolkit/python-prompt-toolkit/blob/3.0.50/CHANGELOG --- pkgs/development/python-modules/prompt-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index caa4e679ea71..a0c274dac938 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.48"; + version = "3.0.50"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-1mI6sEd6gN905ka9vJNiEUP1yvEEIGqikpTVPeGgPZA="; + hash = "sha256-VEdI84YKJiPKXNbSeV56FPPQ4cPJcoNZAT95h3/Im6s="; }; propagatedBuildInputs = [ From 2dfff5550d660e296202d332ee19c00246ba8510 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:41:53 +0100 Subject: [PATCH 180/348] python313Packages.cython: 3.0.11-1 -> 3.0.12 https://github.com/cython/cython/blob/3.0.12/CHANGES.rst --- pkgs/development/python-modules/cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix index 9921c3e86f9b..41c4230dc194 100644 --- a/pkgs/development/python-modules/cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cython"; - version = "3.0.11-1"; + version = "3.0.12"; pyproject = true; src = fetchFromGitHub { owner = "cython"; repo = "cython"; tag = version; - hash = "sha256-P2k21uNC6X+R6a1dWAIspGnUc6JwAzRXUleVfZG+vqY="; + hash = "sha256-clJXjQb6rVECirKRUGX0vD5a6LILzPwNo7+6KKYs2pI="; }; build-system = [ From 6b86e9dcc097774466c816f1636900ab06bdb7f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:51:41 +0100 Subject: [PATCH 181/348] python313Packages.pycodestyle: 2.12.0 -> 2.12.1 https://github.com/PyCQA/pycodestyle/blob/2.12.1/CHANGES.txt --- pkgs/development/python-modules/pycodestyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 8f987478655d..9b3733939c02 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.12.0"; + version = "2.12.1"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "pycodestyle"; rev = version; - hash = "sha256-YN1KOJ8f+VY9vJTWm3aTOOai66dveKOKOpeBkZKkC2A="; + hash = "sha256-rQkOjDikJPHCBqrqxFQ9PLikYSeQZwJnHAmPGRUZecA="; }; pythonImportsCheck = [ "pycodestyle" ]; From a00e1f9643598c66f181eb7176df19c35e9ac0c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 11:52:35 +0100 Subject: [PATCH 182/348] python313Packages.tzlocal: 5.2 -> 5.3 https://github.com/regebro/tzlocal/blob/5.3/CHANGES.txt --- pkgs/development/python-modules/tzlocal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index a4e6ba12061c..427d31ccbcb7 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "5.2"; # version needs to be compatible with APScheduler + version = "5.3"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-jTmSBVePGpNCgWQJzB5GqT69V1XjnqLYUzS+qRG/Dm4="; + hash = "sha256-L6+/wH6di0mt4Y+JjWvNN66IzjrWSGhCouTwOvaDI9I="; }; nativeBuildInputs = [ setuptools ]; From b6bef333c92be20f8785b3f7763c55fd59be01a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 12:28:48 +0100 Subject: [PATCH 183/348] python313Packages.starlette: 0.45.2 -> 0.46.0 https://www.starlette.io/release-notes/#0460 --- pkgs/development/python-modules/starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 81e1bb316b14..fad89171e164 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.45.2"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-c4PAFrsp/KZMwUyvU6sgIyVKzoKM5zrt3is/SAQX3oM="; + hash = "sha256-4lybbJwisjNfqzJsZ5eNni+/KLYBwUU4CiTRshGD5Yo="; }; build-system = [ hatchling ]; From 0c7226843927cb889fd3fe83237b187ef2448560 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 13:54:24 +0100 Subject: [PATCH 184/348] python313Packages.dulwich: 0.22.7 -> 0.22.8 https://github.com/jelmer/dulwich/blob/dulwich-dulwich-0.22.8/NEWS --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index f22c8193f27d..22be832388d2 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "dulwich"; - version = "0.22.7"; + version = "0.22.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "jelmer"; repo = "dulwich"; tag = "dulwich-${version}"; - hash = "sha256-BjDTqrApdinC9T62hhZIMS1udpaiAg1+7nvryF6d6pU="; + hash = "sha256-T0Tmu5sblTkqiak9U4ltkGbWw8ZE91pTlhPVMRi5Pxk="; }; build-system = [ From 25484cf1beb4b3af6256d8eda6eb69bd608e9e9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 22:45:04 +0100 Subject: [PATCH 185/348] python313Packages.pydantic: 2.10.5 -> 2.10.6 https://github.com/pydantic/pydantic/blob/v2.10.6/HISTORY.md --- pkgs/development/python-modules/pydantic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 8d901cd1f892..4d8da843963d 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.10.5"; + version = "2.10.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-SEgBuhof1rqnKFI7O1aajkgp17EgaPNcfJzbh/j4ebg="; + hash = "sha256-vkXvHQ5ipcLfx4qJKY6J4rKXCAfP2rj88GnwGMjM2go="; }; buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; From 1dfe0f5b2c4bc30459d31c5ba247e248919ec7f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 22:48:15 +0100 Subject: [PATCH 186/348] python313Packages.black: 24.10.0 -> 25.1.0 https://github.com/psf/black/blob/25.1.0/CHANGES.md --- pkgs/development/python-modules/black/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 369fe4f14e73..27f18cca5279 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "black"; - version = "24.10.0"; + version = "25.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hG6mTJev47xne3YXh5k75JkYEOzHpKk3gW3Wvd7cSHU="; + hash = "sha256-M0ltXNEiKtczkTUrSujaFSU8Xeibk6gLPiyNmhnsJmY="; }; nativeBuildInputs = [ From 64774164ceca2c7addba64fdf7e8e82a0da0db7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 22:50:10 +0100 Subject: [PATCH 187/348] python313Packages.fastapi: 0.115.6 -> 0.115.11 https://github.com/fastapi/fastapi/releases/tag/0.115.11 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 6fe29c6e3037..ab0e2d87992b 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.115.6"; + version = "0.115.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; tag = version; - hash = "sha256-yNYjFD77q5x5DtcYdywmScuuVdyWhBoxbLYJhu1Fmno="; + hash = "sha256-fE6Bp8iaoamVe2RrFNSVUiiNzt84P1WGum1dfWAX9hk="; }; build-system = [ pdm-backend ]; From 6b1d10a414d649e0e7c89a2883921a7a93e1d881 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 22:53:25 +0100 Subject: [PATCH 188/348] python313Packages.cleo: 2.1.0 -> 2.2.1 https://github.com/python-poetry/cleo/blob/refs/tags/2.2.1/CHANGELOG.md --- pkgs/development/python-modules/cleo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 0bad39ef1ed2..c9b21515f69e 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cleo"; - version = "2.1.0"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; tag = version; - hash = "sha256-reo/7aPFU5uvZ1YPRTJDRmcMSMFru8e5ss5YmjSe3QU="; + hash = "sha256-+OvE09hbF6McdXpXdv5UBdZ0LiSOTL8xyE/+bBNIFNk="; }; nativeBuildInputs = [ From e066c1cbeef526fc78de89048eaed32838564704 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 22:53:49 +0100 Subject: [PATCH 189/348] python313Packages.scikit-build-core: 0.10.7 -> 0.11.0 https://github.com/scikit-build/scikit-build-core/blob/refs/tags/v0.11.0/docs/changelog.md --- .../python-modules/scikit-build-core/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 2cb10a86a1c1..9ff1f0125f06 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonOlder, # build-system @@ -31,25 +30,16 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.10.7"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-build"; repo = "scikit-build-core"; rev = "refs/tags/v${version}"; - hash = "sha256-R6/Y9brIYBA1P3YeG8zGaoPcxWFUDqZlqbZpWu3MIIw="; + hash = "sha256-t22/681GHA3tKBTNQ2b3A8cgMTsUiYUGptRtC2i9W6g="; }; - patches = [ - (fetchpatch2 { - name = "setuptools-75_8-compatibility.patch"; - url = "https://github.com/scikit-build/scikit-build-core/commit/e4e92bc28651001e91999e9759c44fb67cd3d211.patch"; - includes = [ "tests/test_setuptools_pep517.py" ]; - hash = "sha256-nqng1FAY90Qm/yVRkALTsKchqNvsxutbBr51/Q4IKPA="; - }) - ]; - postPatch = lib.optionalString (pythonOlder "3.11") '' substituteInPlace pyproject.toml \ --replace-fail '"error",' '"error", "ignore::UserWarning",' From 3e2b050cbabfb410419b81d47ab543233f3d3030 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:02:33 +0100 Subject: [PATCH 190/348] python313Packages.pyzmq: 26.2.0 -> 26.2.1 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 6f7ecf6b10b6..5cc7e7a9def5 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "26.2.0"; + version = "26.2.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-BwZywlhYHI5PZAtRWSl1gKmXSwJgQ71KsEcL6e0yTx8="; + hash = "sha256-F9cqdOXp/zgp3rcol6F1Mz0+9bVBOUjK489+vwsC7Mo="; }; build-system = [ From 01cef34e58ad44b13af885e2b62d4e3c39e1cf3d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:10:36 +0100 Subject: [PATCH 191/348] python313Packages.typer: 0.15.1 -> 0.15.2 https://github.com/tiangolo/typer/releases/tag/0.15.2 --- pkgs/development/python-modules/typer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index f9384b1fee22..f97ce9b36a65 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "typer"; - version = "0.15.1"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oFiMCn+mihl4oGmBhld3j4ar5v9epqv0cvlAoIv+Two="; + hash = "sha256-qy+rR1M6gTxJ/h8WsaNw/VgZCZwAsRngYz32XyIUS6U="; }; build-system = [ pdm-backend ]; From a0872e51ea9a1b81506f93024589cb13ff7470bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:13:08 +0100 Subject: [PATCH 192/348] python313Packages.executing: 2.1.0 -> 2.2.0 https://github.com/alexmojaki/executing/compare/v2.1.0...v2.2.0 --- .../python-modules/executing/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index fcd5c8a8b6f3..58c766811fe1 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonAtLeast, pythonOlder, @@ -19,8 +18,8 @@ buildPythonPackage rec { pname = "executing"; - version = "2.1.0"; - format = "pyproject"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,18 +27,10 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - hash = "sha256-epgKMPOvPdkpRp0n5A22gZ5DeXLyI60bqzLTx5JFlLk="; + hash = "sha256-2BT4VTZBAJx8Gk4qTTyhSoBMjJvKzmL4PO8IfTpN+2g="; }; - patches = [ - (fetchpatch { - name = "python-3.12.6.patch"; - url = "https://github.com/alexmojaki/executing/commit/3f11fdcd7a017fbdca8a3a9de23dab18d3ba2100.patch"; - hash = "sha256-ZnTO9lT+bj4nekPx4D0DxjhJOCkZn6lDm5xdLrziB+4="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; From 7f830f27aa03bccf0737659bd589249752744625 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:13:19 +0100 Subject: [PATCH 193/348] python313Packages.websockets: 14.1 -> 15.0 https://github.com/aaugustin/websockets/blob/15.0/docs/project/changelog.rst --- pkgs/development/python-modules/websockets/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 89e705b4fcad..711f3fdec697 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -7,11 +7,12 @@ pythonAtLeast, pythonOlder, setuptools, + werkzeug, }: buildPythonPackage rec { pname = "websockets"; - version = "14.1"; + version = "15.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "aaugustin"; repo = "websockets"; tag = version; - hash = "sha256-lH4BPP8AjR13rnl4m7IP52iSGHjKE4q1AmHv4t+PRXw="; + hash = "sha256-PlR2a0KNycdq/FhUX0qpthrrRckuE61FYV4uqHOMsY0="; }; build-system = [ setuptools ]; @@ -46,7 +47,10 @@ buildPythonPackage rec { "test_reject_invalid_server_certificate" ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + werkzeug + ]; preCheck = '' # https://github.com/python-websockets/websockets/issues/1509 From 5db61c7bd1d04a5c74f200c261d9dc11db1a44ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:15:35 +0100 Subject: [PATCH 194/348] python313Packages.pymongo: 4.10.1 -> 4.11.2 --- pkgs/development/python-modules/pymongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 1e1f16f531e8..426853bd6544 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.10.1"; + version = "4.11.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pymongo"; - hash = "sha256-qd4CvlO2u5jv4LntqE/6HsAn/LI6LeYsT5Qdmi8vMzA="; + hash = "sha256-0O4+AnX2e93Ng7ImOBi3xK568eyv6+frf9FjiUV+whA="; }; build-system = [ From 64134ec65a73a769e7ef336bd623cb5b4e0378a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:19:45 +0100 Subject: [PATCH 195/348] python313Packages.setproctitle: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/setproctitle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index f88055d575da..05452c56951a 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "setproctitle"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O0DTKj4fBOlCMe1t/uDankO0+ca1RQ1T5t13VMNODFA="; + hash = "sha256-Hm6ur4pzTUKKldjBBGQ7Oa99JH1gT0CnvrzzlgqFPF4="; }; nativeBuildInputs = [ setuptools ]; From d1b078de251b6db569870a1d52957448e79073aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:20:22 +0100 Subject: [PATCH 196/348] python313Packages.mistune: 3.1.0 -> 3.1.2 https://github.com/lepture/mistune/blob/v3.1.2/docs/changes.rst --- pkgs/development/python-modules/mistune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 45f128abb7e8..adbe92f6f151 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mistune"; - version = "3.1.0"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "mistune"; tag = "v${version}"; - hash = "sha256-gXCFBe58Ij6CiwTddsI4tkPsGBR2z9D8dnxlvTXGSMw="; + hash = "sha256-XvDp+X/+s6TsUC889qjTGzrde6s/BYoXUw2AblaATnI="; }; dependencies = lib.optionals (pythonOlder "3.11") [ From de02320591872052b1d8f378707769710b8ca789 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:24:36 +0100 Subject: [PATCH 197/348] python312Packages.pytzdata: remove Timezone database stuck in 2020. Use pytz or tzdata instead. --- .../python-modules/pytzdata/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/pytzdata/default.nix diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix deleted file mode 100644 index 8b66daba06af..000000000000 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, -}: - -buildPythonPackage rec { - pname = "pytzdata"; - version = "2020.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "3efa13b335a00a8de1d345ae41ec78dd11c9f8807f522d39850f2dd828681540"; - }; - - # No tests - doCheck = false; - - meta = with lib; { - description = "Timezone database for Python"; - homepage = "https://github.com/sdispater/pytzdata"; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ccf71248b1fc..7bd1df97cc5e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -598,6 +598,7 @@ mapAliases ({ pytorchWithCuda = torchWithCuda; # added 2022-09-30 pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 + pytzdata = throw "pytzdata has been removed, because iit is unmaintained upstream. Use pytz or tzdata instead."; # added 2025-03-03 pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09 pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17 pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c932905bf16..e1ed62bfa4be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13834,8 +13834,6 @@ self: super: with self; { pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { }; - pytzdata = callPackage ../development/python-modules/pytzdata { }; - pyu2f = callPackage ../development/python-modules/pyu2f { }; pyudev = callPackage ../development/python-modules/pyudev { From bf660617308eafa7ddac54300edff7deaa4af121 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:26:39 +0100 Subject: [PATCH 198/348] python313Packages.lz4: 4.4.1 -> 4.4.3 https://github.com/python-lz4/python-lz4/releases/tag/v4.4.3 --- pkgs/development/python-modules/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 3e3a0438a60b..048cc8e163f7 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lz4"; - version = "4.4.1"; + version = "4.4.3"; pyproject = true; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "python-lz4"; repo = "python-lz4"; tag = "v${version}"; - hash = "sha256-dqu1sRqvtb1eyjxrCFu1vom9//qDGhgCMnPhKnIktjw="; + hash = "sha256-Jnmi2eyTGbPuqw0llQ5xpUWlj+8QvRHMwkak/GsypU0="; }; postPatch = '' From 3c3803b1ac7826d0c2b57134f31d035cab8ec9be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:27:09 +0100 Subject: [PATCH 199/348] python313Packages.semver: 3.0.3 -> 3.0.4 https://github.com/python-semver/python-semver/releases/tag/3.0.0 --- pkgs/development/python-modules/semver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 29f439d74b05..0886e5fedb2c 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "semver"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-semver"; repo = "python-semver"; tag = version; - hash = "sha256-/E2wJcAmEnmK9QSl7a4aLMHCIh0glq9VIlYls6GhfXM="; + hash = "sha256-ry6r2cY/DRTiPxT+ZiumgFbQyHNzL8i1QcQbLWjnDVE="; }; postPatch = '' From d5446e9ca470dbeb9f02d6dbcecd796217be1efe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:28:17 +0100 Subject: [PATCH 200/348] python313Packages.pyopenssl: 24.3.0 -> 25.0.0 https://github.com/pyca/pyopenssl/blob/25.0.0/CHANGELOG.rst --- pkgs/development/python-modules/pyopenssl/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index b06e746987a0..f70aef65ec33 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -6,6 +6,7 @@ openssl, setuptools, cryptography, + typing-extensions, pytestCheckHook, pretend, sphinxHook, @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "24.3.0"; + version = "25.0.0"; pyproject = true; src = fetchFromGitHub { owner = "pyca"; repo = "pyopenssl"; tag = version; - hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0="; + hash = "sha256-CQHLEtNb2jX7WNAYlmv5EIgepetMl81Xl3AJuRqOHow="; }; outputs = [ @@ -41,7 +42,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cryptography" ]; - dependencies = [ cryptography ]; + dependencies = [ + cryptography + typing-extensions + ]; nativeCheckInputs = [ pretend From 25ca0dcd0cbd6b0b42e7aaffec4ec1e833e5baf4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:30:06 +0100 Subject: [PATCH 201/348] python313Packages.simplejson: 3.19.3 -> 3.20.1 https://github.com/simplejson/simplejson/blob/v3.20.1/CHANGES.txt --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 7eb59d7abf70..49b0c3061747 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.3"; + version = "3.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = pname; tag = "v${version}"; - hash = "sha256-M6ohYhw7xvZiNVm9uhotvPHeVsBOwYjDpj2sfXAzf0U="; + hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas="; }; nativeCheckInputs = [ pytestCheckHook ]; From 40140c8b8c1886b400688d925a1d5a1fdff221dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:30:48 +0100 Subject: [PATCH 202/348] python313Packages.json5: 0.9.28 -> 0.10.0 https://github.com/dpranke/pyjson5/compare/refs/tags/v0.9.28...v0.10.0 --- pkgs/development/python-modules/json5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index 86ae590811bd..1f6944bcd88a 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.28"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dpranke"; repo = "pyjson5"; tag = "v${version}"; - hash = "sha256-CE9l+SOLTcdtyPZH/iz6y6K22UQS+CxC3HoLYlkIV8M="; + hash = "sha256-J5xZN6o9UwvCdrzEY6o3NxYaxbtiUhmTtCQJia4JmI4="; }; build-system = [ setuptools ]; From 61e21052fcc0cb86bbd2ee89ebcc4284af0b6d7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:32:29 +0100 Subject: [PATCH 203/348] python313Packages.pydantic-settings: 2.7.1 -> 2.8.1 https://github.com/pydantic/pydantic-settings/compare/refs/tags/v2.7.1...v2.8.1 --- pkgs/development/python-modules/pydantic-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 63d0e997fd7a..69b1b43cdf92 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.7.1"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ let owner = "pydantic"; repo = "pydantic-settings"; tag = "v${version}"; - hash = "sha256-kxXH8GNBSF70pWXdALAAQ0Tg7Zx1VRO0Ej4xSncR0Mo="; + hash = "sha256-Bvdq4ATOhLjowkyR39y0Jxi+wuPbpVW30qtbsXa9+HA="; }; build-system = [ hatchling ]; From 6c3a56bbb4f3c002714f57b0de501f02375af31d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:44:52 +0100 Subject: [PATCH 204/348] python313Packages.ulid-transform: 1.2.0 -> 1.2.1 https://github.com/bdraco/ulid-transform/blob/v1.2.1/CHANGELOG.md --- pkgs/development/python-modules/ulid-transform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index a776a9e1b27b..1f412bdefd1f 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "ulid-transform"; tag = "v${version}"; - hash = "sha256-+P5sd3FSk9SYmeHkatB88EE+/1vktyiJJeaecbBkBhI="; + hash = "sha256-Rg9es24nsHy+y7uV0da120n1FDGJ9buSRi94L23H59c="; }; build-system = [ From 6042e17c1665cfa5907ed8d74c4346bd5a702a1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:50:55 +0100 Subject: [PATCH 205/348] selenium-manager: 4.28.0 -> 4.29.0 --- .../se/selenium-manager/disable-telemetry.patch | 6 +++--- pkgs/by-name/se/selenium-manager/package.nix | 12 +++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch index 0591c5b2d438..28db72d7595b 100644 --- a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch +++ b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch @@ -1,7 +1,7 @@ -diff --git a/rust/src/config.rs b/rust/src/config.rs +diff --git a/src/config.rs b/src/config.rs index f7cd4f32ec..ec454127be 100644 ---- a/rust/src/config.rs -+++ b/rust/src/config.rs +--- a/src/config.rs ++++ b/src/config.rs @@ -120,7 +120,7 @@ impl ManagerConfig { avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(), language_binding: StringKey(vec!["language-binding"], "").get_value(), diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 9b33ee7b7672..44f92db58aed 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -7,25 +7,23 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.28.0"; + version = "4.29.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}"; - hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; + hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; }; + sourceRoot = "${src.name}/rust"; + patches = [ ./disable-telemetry.patch ]; - postPatch = '' - cd rust - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-hXtF3qFzzM2TqpEP9JWdi7uU5TgFHF9lZO5bmZcEuDk="; + cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From dd74b4475de83e81b045db43981166441fae0ac1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:51:25 +0100 Subject: [PATCH 206/348] python313Packages.selenium: 4.28.0 -> 4.29.0 https://github.com/SeleniumHQ/selenium/compare/refs/tags/selenium-4.28.0...4.29.0 --- pkgs/development/python-modules/selenium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 356d8f5598da..cc4cb5485140 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.28.0"; + version = "4.29.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "SeleniumHQ"; repo = "selenium"; tag = "selenium-${version}" + lib.optionalString (lib.versions.patch version != "0") "-python"; - hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; + hash = "sha256-IyMXgYl/TPTpe/Y0pFyJVKj4Mp0xbkg1LSCNHzFL3bE="; }; patches = [ ./dont-build-the-selenium-manager.patch ]; From e43e30a3d6dd4be687aba418afbd09136f708ed1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:57:28 +0100 Subject: [PATCH 207/348] python313Packages.aiohttp-fast-zlib: 0.2.1 -> 0.2.3 https://github.com/bdraco/aiohttp-fast-zlib/blob/refs/tags/v0.2.3/CHANGELOG.md --- pkgs/development/python-modules/aiohttp-fast-zlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix index 77ca01bfda4c..691166682984 100644 --- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix +++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiohttp-fast-zlib"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiohttp-fast-zlib"; tag = "v${version}"; - hash = "sha256-OVxt1SQXOFbgnmA3FP56xixmgh5gOe/HDgzPVlr0JPg="; + hash = "sha256-PQ44XFdaolxGQTwzssv1inOUAGAyYghS3SVLq4w5SoA="; }; postPatch = '' From 0a3988b596a7e97272278e43cfcc52133006844f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Mar 2025 23:57:47 +0100 Subject: [PATCH 208/348] python313Packages.aiohttp-asyncmdnsresolver: 0.1.0 -> 0.1.1 https://github.com/aio-libs/aiohttp-asyncmdnsresolver/blob/v0.1.1/CHANGES.rst --- .../python-modules/aiohttp-asyncmdnsresolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix index 19ae19352c2b..f20c0156768b 100644 --- a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix +++ b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiohttp-asyncmdnsresolver"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp-asyncmdnsresolver"; rev = "v${version}"; - hash = "sha256-z0m8dlzl6mglTOW9BwLbFcRjxcF14yz8+SE8SqjNu+c="; + hash = "sha256-gtB5vnlOVeAFACnhR5DIS5p3caZkOXrollXFINl/7hQ="; }; build-system = [ setuptools ]; From 6c32fae3134af78a28ecbecd507d363c790522cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:01:44 +0100 Subject: [PATCH 209/348] python313Packages.pytest-unordered: 0.5.2 -> 0.6.1 https://github.com/utapyngo/pytest-unordered/blob/v0.6.1/CHANGELOG.md --- .../python-modules/pytest-unordered/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix index 4057319ff1e8..dc5aacf40ce2 100644 --- a/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -2,27 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + mock, pytest, - pytest7CheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-unordered"; - version = "0.5.2"; - format = "setuptools"; + version = "0.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "utapyngo"; repo = "pytest-unordered"; tag = "v${version}"; - hash = "sha256-51UJjnGBO7qBvQlY8F0B29n8+EO2aa3DF3WOwcjZzSo="; + hash = "sha256-nANsX28+G8jcSe8X0dB6Tu3HYHd9ebGkh1AUx8Xq8HM="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; nativeCheckInputs = [ - # https://github.com/utapyngo/pytest-unordered/issues/15 - pytest7CheckHook + mock + pytestCheckHook ]; pythonImportsCheck = [ "pytest_unordered" ]; From 170cbb51b481867730c30cc7bcfc52c245175313 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:05:14 +0100 Subject: [PATCH 210/348] python313Packages.pyproject-api: 1.8.0 -> 1.9.0 https://github.com/tox-dev/pyproject-api/releases/tag/1.9.0 --- pkgs/development/python-modules/pyproject-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 023a61e6137a..043db0acb7c8 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; tag = version; - hash = "sha256-zFV44xqbwe1QsIVurvsjqY+zxC+X2hCljZ5u70kNTSU="; + hash = "sha256-4oX/h3EiLZIfHhU6zBD9ZQYnHGrid93LkJzaC6swBdI="; }; outputs = [ From 8e944d0e232d50084e554d2b0b37057d32965197 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:05:44 +0100 Subject: [PATCH 211/348] python313Packages.pbr: 6.1.0 -> 6.1.1 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index d500a215be11..fe52ff5b7da9 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-eIGD44Lj0ddwfbCJeCOZZei55OXtQmab9HWBhnNNXyQ="; + hash = "sha256-k+pyzmmJ6y7tmdD3VyFHT2mtiBKK/e9aw3freXxL92s="; }; build-system = [ setuptools ]; From a6f5c82b88375c4ae5520f8343c06e366d1f11e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:14:37 +0100 Subject: [PATCH 212/348] python313Packages.faker: 33.3.1 -> 36.1.1 --- pkgs/development/python-modules/faker/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 90279e317403..968a93b8dd6e 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,18 +8,19 @@ python-dateutil, setuptools, typing-extensions, + tzdata, ukpostcodeparser, validators, }: buildPythonPackage rec { pname = "faker"; - version = "33.3.1"; + version = "36.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Sd3jsGpWAhd7wq0BMUm29gopC3FUU5GA03tvh2rnmyA="; + hash = "sha256-fLK71MjwQOSjQK5AGemki2zx22pxvaTlph2NE7e+8o0="; }; build-system = [ setuptools ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { dependencies = [ python-dateutil typing-extensions + tzdata ]; nativeCheckInputs = [ From eae2a03ad0de657ede845974f160fc749e673a62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:15:30 +0100 Subject: [PATCH 213/348] python313Packages.mock: 5.1.0 -> 5.2.0 https://github.com/testing-cabal/mock/blob/5.2.0/CHANGELOG.rst --- pkgs/development/python-modules/mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 20c78bf4f18e..9f8895131c6d 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mock"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; + hash = "sha256-TkYOgYYptLFz8y0IvzDTr4Ejr7uOBLtXB6H9R5nlA/A="; }; nativeCheckInputs = [ pytestCheckHook ]; From b47f66ce23a65e182281451fa55c0eaa08b11506 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:18:31 +0100 Subject: [PATCH 214/348] python313Packages.trio: 0.28.0 -> 0.29.0 https://github.com/python-trio/trio/blob/v0.29.0/docs/source/history.rst --- pkgs/development/python-modules/trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 7c24edb26354..bc5b4ee8b440 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -35,7 +35,7 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.28.0"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio"; tag = "v${version}"; - hash = "sha256-ru5Q7YHpnA/hLwh2Og5Hp3z6XJCv/BHHW0S26N1oTJ0="; + hash = "sha256-f77HXhXkPu2GMKCFqahfiP0EgpjyRqWaxzduqM2oXtA="; }; build-system = [ setuptools ]; From 6842c0f1b77c8fee7a5833f925047efe267c6a8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:18:44 +0100 Subject: [PATCH 215/348] python313Packages.deepdiff: 8.1.1 -> 8.2.0 https://github.com/seperman/deepdiff/releases/tag/8.2.0 --- pkgs/development/python-modules/deepdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index f347cc0a1a5b..508382d0dd48 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; tag = version; - hash = "sha256-b1L+8xOqxY2nI8UxZHxs3x28mVAzaRuPjYlPSqSapwk="; + hash = "sha256-5RiYVNdKfTRNeqtbKwFdbB5Z12eAMNdaOFCNevR6H6w="; }; build-system = [ From a1a5d8e84bdb5833afcbe7265529d50f3d0a488a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 00:23:17 +0100 Subject: [PATCH 216/348] python313Packages.xarray: 2025.01.1 -> 2025.01.2 https://github.com/pydata/xarray/blob/v2025.01.2/doc/whats-new.rst --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 22b130aea67f..db52743bc0ec 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2025.01.1"; + version = "2025.01.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-BUpMNdYu72/R36r6XXHQqwIWL/ip+O+yE4WxcQQ3ZLY="; + hash = "sha256-Ub3XHMhMnJ9i746o701PYSai8ulTdjLx4OWal2KUTLM="; }; build-system = [ From 670941318a420038ed924003c393080e968b94fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 01:11:50 +0100 Subject: [PATCH 217/348] python313Packages.trio-websocket: 0.11.1 -> 0.12.2 https://github.com/HyperionGray/trio-websocket/blob/0.12.2/CHANGELOG.md --- pkgs/development/python-modules/trio-websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 2804bcaa76e5..afcc26350ee9 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "trio-websocket"; - version = "0.11.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "HyperionGray"; repo = "trio-websocket"; rev = version; - hash = "sha256-ddLbYkb1m9zRjv3Lb7YwUzj26gYbK4nYN6jN+FAuiOs="; + hash = "sha256-TGFf4WUeZDrjp/UiQ9O/GoaK5BRC2aaGZVPfqZ4Ip9I="; }; build-system = [ setuptools ]; From 0a4b8d07a33175f9964f86bf351b0feb965ae8c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 01:12:03 +0100 Subject: [PATCH 218/348] python313Packages.prettytable: 3.12.0 -> 3.15.1 https://github.com/jazzband/prettytable/releases/tag/3.15.1 --- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 32257b5ffa9a..69e14b308ef5 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.12.0"; + version = "3.15.1"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "prettytable"; tag = version; - hash = "sha256-RoBPmnuAOtTET898Gdm1zzPIst26GdCY5nU1PyJ+Nro="; + hash = "sha256-18FXxC1j5EWGnKzgNOr0TRRnlRXzQ9IwSe7YGx92Gf4="; }; build-system = [ From c15754a4ba800864df1115838cb8248cd3dc87cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 01:28:59 +0100 Subject: [PATCH 219/348] python313Packages.scikit-image: 0.25.0 -> 0.25.2 https://github.com/scikit-image/scikit-image/releases/tag/v0.25.2 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 5aca6b4dabc5..d5439693c4fc 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -35,7 +35,7 @@ let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.25.0"; + version = "0.25.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ let owner = "scikit-image"; repo = "scikit-image"; tag = "v${version}"; - hash = "sha256-v2bgazzx+7aoUgoOQvqhYJkSOzSJ5TWwEwBgHxRP318="; + hash = "sha256-viRX7Uh9coacueI6gJHBtOay/UIiUQkBfjpmDLJgyZ4="; }; postPatch = '' From 9f71e38fd6a5d36ecf3484699493262e63fe295a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 01:34:04 +0100 Subject: [PATCH 220/348] python313Packages.moto: 5.0.28 -> 5.1.1 https://github.com/getmoto/moto/blob/5.1.1/CHANGELOG.md --- pkgs/development/python-modules/moto/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index d824661a8bcd..366004b12cdb 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.28"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "moto"; tag = version; - hash = "sha256-++kkPiI3AOTF+VlvPWhjhuiIjiHQPa3M0Nmh3+1PHSE="; + hash = "sha256-KMIOLM7KQqF2JwYWHWAD9GVKRTd2adVBubwWrnlHGoQ="; }; build-system = [ @@ -351,6 +351,9 @@ buildPythonPackage rec { # Parameter validation fails "test_conditional_write" + + # Requires newer botocore version + "test_dynamodb_with_account_id_routing" ]; disabledTestPaths = [ From 31f2e24bdb47cf936d49473c9b053591bb7307c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:02:59 +0100 Subject: [PATCH 221/348] python313Packages.jsonpickle: 4.0.1 -> 4.0.2 --- pkgs/development/python-modules/jsonpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 1bf5b065445f..cbc896e89018 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tTNhRNkClYuSywi8Hna/pHGZuK/UVDA2k4lN79L6UMU="; + hash = "sha256-PmULmFOtzaudnWKohBK2026aWbpCOwHKzwzU7oBzOso="; }; build-system = [ From 97746f67f22f7da4c1717d0e4d86089ebab32ce1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:05:48 +0100 Subject: [PATCH 222/348] python313Packages.srsly: fix build --- pkgs/development/python-modules/srsly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 41d052471810..d7a5b5a18507 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, - cython_0, + cython, catalogue, mock, numpy, @@ -26,12 +26,12 @@ buildPythonPackage rec { hash = "sha256-qxtL9s8+Kdoj2uBJPdFRf7eHB1IGUSNRQhuJtPwnx34="; }; - nativeBuildInputs = [ - cython_0 + build-system = [ + cython setuptools ]; - propagatedBuildInputs = [ catalogue ]; + dependencies = [ catalogue ]; nativeCheckInputs = [ mock From 7663514351f5d6b5612509244f81c4ada7497df2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:07:46 +0100 Subject: [PATCH 223/348] python313Packages.pypdf: 5.1.0 -> 5.3.1 https://github.com/py-pdf/pypdf/blob/refs/tags/5.3.1/CHANGELOG.md --- pkgs/development/python-modules/pypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 24456e08cea4..1fe59a9681a5 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "5.1.0"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-ziJTYl7MQUCE8US0yeiq6BPDVbBsxWhti0NyiDnKtfE="; + hash = "sha256-4q4Se/8psa6hl+PA1vnh/3HpQsihDL8UCg0ScNLg61o="; }; outputs = [ From b0ebd6389f8a3d0a4b86a482fa031c9afabe4e47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:08:01 +0100 Subject: [PATCH 224/348] python313Packages.bitarray: 3.0.0 -> 3.1.0 https://github.com/ilanschnell/bitarray/raw/3.1.0/CHANGE_LOG --- pkgs/development/python-modules/bitarray/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 3890c2b57da8..0f1e74be5faa 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -4,20 +4,23 @@ fetchPypi, python, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "bitarray"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ogg9wg8Ngop833oWsg2uVqqw9D3E80ejswOfZXeZKwM="; + hash = "sha256-cXVxcaRerFh4KGHEkTe6O+0NpIkVUxGFf2n06br4H6Q="; }; + build-system = [ setuptools ]; + checkPhase = '' cd $out ${python.interpreter} -c 'import bitarray; bitarray.test()' From ed706ef02bb0fd0d9baeac3b52176f47467d0b80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:13:15 +0100 Subject: [PATCH 225/348] python313Packages.phonenumbers: 8.13.53 -> 8.13.55 https://github.com/daviddrysdale/python-phonenumbers/blob/v8.13.55/python/HISTORY.md --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 40f4865c49f4..fd6b9ff7003c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.53"; + version = "8.13.55"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tzCPIYN976VntPlhkltsZS3VFI8+D629FYoQdYzGPZE="; + hash = "sha256-V8mJ3aPqurG1qePSRDijnr0DL6AXK/aL/ZCrcLPV4Is="; }; build-system = [ setuptools ]; From 3ec3f2f9829e5d8a1712ca3ab5f7e5ade21a0b29 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:15:39 +0100 Subject: [PATCH 226/348] python312Packages.rapidfuzz: 3.12.1 -> 3.12.2 https://github.com/maxbachmann/RapidFuzz/blob/v3.12.2/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 71a7c6188da3..e3551b0373ad 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -8,7 +8,6 @@ cython, ninja, scikit-build-core, - setuptools, numpy, hypothesis, pandas, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.12.1"; + version = "3.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,14 +27,9 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; tag = "v${version}"; - hash = "sha256-33NwGWulBJ7WAMAE0163OJM9kL04FuHa5P7m66PZL6s="; + hash = "sha256-keV+IBBHkdDpKuT1o6xNA5UAHlG1I9vkt13W8dafiDw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "Cython >=3.0.11, <3.1.0" "Cython" - ''; - build-system = [ cmake cython From 507ce59631f98e30cbba684a94727cef6e87cc56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:17:29 +0100 Subject: [PATCH 227/348] python313Packages.pyproj: 3.7.0 -> 3.7.1 https://github.com/pyproj4/pyproj/blob/refs/tags/3.7.1/docs/history.rst --- pkgs/development/python-modules/pyproj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 77f863139ed5..9d7df731dfb1 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pyproj4"; repo = "pyproj"; tag = version; - hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM="; + hash = "sha256-tVzifc+Y5u9Try5FHt67rj/+zaok0JNn3M8plMqX90g="; }; # force pyproj to use ${proj} From c127dc807daddcbc38e582e25af15990c12d9b92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:17:52 +0100 Subject: [PATCH 228/348] python312Packages.levenshtein: 0.27.0 -> 0.27.1 https://github.com/maxbachmann/Levenshtein/blob/v0.27.1/HISTORY.md --- pkgs/development/python-modules/levenshtein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 9e8ea3dec57c..5345deedeb0b 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.27.0"; + version = "0.27.1"; pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "Levenshtein"; tag = "v${version}"; - hash = "sha256-kiYu46qv8sBBcPoCo3PN1q9F0EJ1s5hAMKavPaztM4s="; + hash = "sha256-YMXT0rfd7S4jisMdHqOrsHKLzQ2hm8UfxhIFU7BbWBQ="; fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` }; From befeade2ca211a1525c05a083f9b4e9b521fb32d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:19:24 +0100 Subject: [PATCH 229/348] python312Packages.resolvelib: 1.0.1 -> 1.1.0 https://github.com/sarugaku/resolvelib/blob/1.1.0/CHANGELOG.rst --- pkgs/development/python-modules/resolvelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 98e8e8d6487d..3bb181342c65 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "resolvelib"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; rev = version; - hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; + hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; }; build-system = [ setuptools ]; From ea803c055a03805028a27499709ca558253bb0d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:23:49 +0100 Subject: [PATCH 230/348] python313Packages.django-cors-headers: 4.6.0 -> 4.7.0 https://github.com/adamchainz/django-cors-headers/blob/4.7.0/CHANGELOG.rst --- .../python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index c175f21bc01b..44c17f782993 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = "django-cors-headers"; tag = version; - hash = "sha256-Dvsuj+U1YFC9jT5qkh2h1aL71JkRsAyXW4rxhLzEbOw="; + hash = "sha256-xKdHUGsl9H724IQn/AFtdumB/TH8m2pUUXs263gYsEg="; }; build-system = [ setuptools ]; From 4b5a08abda825452be06f4d514612b2b755244ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:29:41 +0100 Subject: [PATCH 231/348] python312Packages.fastparquet: 2024.5.0 -> 2024.11.0 https://github.com/dask/fastparquet/blob/2024.11.0/docs/source/releasenotes.rst --- pkgs/development/python-modules/fastparquet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index c162a229cac2..930498cc5a6e 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2024.5.0"; + version = "2024.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "dask"; repo = "fastparquet"; tag = version; - hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4="; + hash = "sha256-GJ6dr36hGjpfEKcA96RpEqY8I1vXooLDGwc0A57yFTY="; }; build-system = [ From def4a2707204f1b72df7f2bd03eb0424858b5e76 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:30:39 +0100 Subject: [PATCH 232/348] python312Packages.geoip2: 4.8.1 -> 5.0.1 https://github.com/maxmind/GeoIP2-python/blob/v5.0.1/HISTORY.rst --- pkgs/development/python-modules/geoip2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index a6b7b7081e2b..605b7f67b1dc 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "geoip2"; - version = "4.8.1"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-muouq0s+YlL0dFZSiunDWxBMRSd2OcE/zhvofJL4Qlc="; + hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY="; }; build-system = [ From f5988073b54a566cb3c97cd14e1f661f20368459 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:33:43 +0100 Subject: [PATCH 233/348] python312Packages.pytest-django: 4.9.0 -> 4.10.0 https://github.com/pytest-dev/pytest-django/blob/v4.10.0/docs/changelog.rst --- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 63032480164a..c35057d20b6a 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytest-django"; - version = "4.9.0"; + version = "4.10.0"; pyproject = true; src = fetchPypi { pname = "pytest_django"; inherit version; - hash = "sha256-i/e8NYya5vb8UbbOuxkP4gISGW5oBxIfEb1qOwNCgxQ="; + hash = "sha256-EJGyDqFJH9BKMQ/Jqv9MAbToRQ47FXaHYl4WprXzo2Y="; }; build-system = [ From 6c48714d9b999f2750ad7fa4e312d9d09a604b2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:33:43 +0100 Subject: [PATCH 234/348] python313Packages.posthog: 3.8.3 -> 3.18.1 https://github.com/PostHog/posthog-python/blob/v3.18.1/CHANGELOG.md --- pkgs/development/python-modules/posthog/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 8e27c4e00d6b..98496c26958f 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -1,12 +1,15 @@ { lib, + anthropic, backoff, buildPythonPackage, + distro, fetchFromGitHub, freezegun, mock, monotonic, openai, + parameterized, pytestCheckHook, python-dateutil, requests, @@ -16,20 +19,21 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.8.3"; + version = "3.18.1"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-s4MVpJb5sRe4TIW9Bb068JTnUkObGOG3VlbWVuPPTM4="; + hash = "sha256-1jJACzDf8J4Vsrvtj0PgeK1Ck2Bzy5ThHm0Ohd+LyYs="; }; build-system = [ setuptools ]; dependencies = [ backoff + distro monotonic python-dateutil requests @@ -37,9 +41,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + anthropic freezegun mock openai + parameterized pytestCheckHook ]; @@ -59,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with PostHog"; homepage = "https://github.com/PostHog/posthog-python"; - changelog = "https://github.com/PostHog/posthog-python/releases/tag/${src.tag}"; + changelog = "https://github.com/PostHog/posthog-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; From 90fd3bd74440f6f83085ab7a6044bb743e925cbd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:38:35 +0100 Subject: [PATCH 235/348] python312Packages.jsonlines: 3.1.0 -> 4.0.0 https://github.com/wbolster/jsonlines/compare/3.1.0...4.0.0 --- pkgs/development/python-modules/jsonlines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index fbe7007b248f..b5f3da6150ff 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "jsonlines"; - version = "3.1.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "wbolster"; repo = pname; rev = version; - hash = "sha256-eMpUk5s49OyD+cNGdAeKA2LvpXdKta2QjZIFDnIBKC8="; + hash = "sha256-KNEJdAxEgd0NGPnk9J51C3yUN2e6Cvvevth0iKOMlhE="; }; propagatedBuildInputs = [ attrs ]; From 999c27adda9e9faaacd85130ad682da37668347a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:39:29 +0100 Subject: [PATCH 236/348] python312Packages.rich-click: 1.8.5 -> 1.8.6 https://github.com/ewels/rich-click/blob/v1.8.6/CHANGELOG.md --- pkgs/development/python-modules/rich-click/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index e3087e105d95..c271a27557d1 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.8.5"; + version = "1.8.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ewels"; repo = "rich-click"; tag = "v${version}"; - hash = "sha256-S03cCQWs+tpX+5a9KmCOInXC9++gUXS1J7hTARz7VZQ="; + hash = "sha256-3spiDhSpVobhJMKfU7ZvQf9srD4goKowIl6LiBziiLA="; }; build-system = [ setuptools ]; From 963acd96c77b2e45f1c1c5af965ce03ef0b32af4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:39:50 +0100 Subject: [PATCH 237/348] python312Packages.stripe: 11.5.0 -> 11.6.0 https://github.com/stripe/stripe-python/blob/v11.6.0/CHANGELOG.md --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 373201e835a9..42b7fac621ec 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "11.5.0"; + version = "11.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vD4DWP/CPV7PqKr+wfpPBI7oEHwyN7ywAAPmjIyW+gI="; + hash = "sha256-DO18ziOmyxo5PIah9/lDXJ2Drny9VWNihoyvYstEqSw="; }; build-system = [ setuptools ]; From 380945f6e7cc033b3cfccbac107748fb9f1d46bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:40:38 +0100 Subject: [PATCH 238/348] python312Packages.boltons: 24.1.0 -> 25.0.0 https://github.com/mahmoud/boltons/blob/25.0.0/CHANGELOG.md --- pkgs/development/python-modules/boltons/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index d0ef10d178b9..0f19424445c9 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + flit-core, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "boltons"; - version = "24.1.0"; - format = "setuptools"; + version = "25.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,11 @@ buildPythonPackage rec { owner = "mahmoud"; repo = "boltons"; tag = version; - hash = "sha256-rKBuqJ4EAm0OH97oeGOgcTcMWsloyU2u/PaBEKhm8dA="; + hash = "sha256-kBOU17/jRRAGb4MGawY0PY31OJf5arVz+J7xGBoMBkg="; }; + build-system = [ flit-core ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests bind to localhost From bd38b7c06ec0d864dcb458b6ecab2d931c8c1dfc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Mar 2025 02:42:20 +0100 Subject: [PATCH 239/348] python312Packages.factory-boy: 3.3.1 -> 3.3.3 https://github.com/FactoryBoy/factory_boy/blob/3.3.3/docs/changelog.rst --- pkgs/development/python-modules/factory-boy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/factory-boy/default.nix b/pkgs/development/python-modules/factory-boy/default.nix index b7362eb13913..0f64af0a7992 100644 --- a/pkgs/development/python-modules/factory-boy/default.nix +++ b/pkgs/development/python-modules/factory-boy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "factory-boy"; - version = "3.3.1"; + version = "3.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "factory_boy"; inherit version; - hash = "sha256-gxeqUonN/EX5yuVw/rB6YXcxbILjTRTfPC4fIvJqvvA="; + hash = "sha256-hmhi0iYSjfrH8rQWAofomdr1TyYSd4Mn3QPQ4ssePQM="; }; build-system = [ setuptools ]; From 69dcb66fe5d7ada01d4adb15236e41c3924cb7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 3 Mar 2025 18:00:57 -0800 Subject: [PATCH 240/348] python313Packages.propcache: 0.2.1 -> 0.3.0 (#386465) Diff: https://github.com/aio-libs/propcache/compare/refs/tags/v0.2.1...v0.3.0 Changelog: https://github.com/aio-libs/propcache/blob/refs/tags/v0.3.0/CHANGES.rst --- pkgs/development/python-modules/propcache/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index 00a03b737ed4..6c3d35544bec 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "propcache"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "propcache"; tag = "v${version}"; - hash = "sha256-j2PjSaOx0IKijoMjhtYVNrpqEwRjVFsON5OU/Fv5idc="; + hash = "sha256-3jsQnRkXBB7/6xY44kv7JuAXz/P8oxUg8Hyg1O5w2Cg="; }; + postPatch = '' + substituteInPlace packaging/pep517_backend/_backend.py \ + --replace "Cython ~= 3.0.12" Cython + ''; + build-system = [ cython expandvars @@ -44,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Fast property caching"; homepage = "https://github.com/aio-libs/propcache"; - changelog = "https://github.com/aio-libs/propcache/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/propcache/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; From 35790737bb997e43b176dc8fecef0b367a4343f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Mar 2025 10:08:47 -0800 Subject: [PATCH 241/348] python313Packages.requests: don't depend on brotlicffi --- pkgs/development/python-modules/requests/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 6ffe869c0a6a..cc80e5bb0de0 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - brotlicffi, buildPythonPackage, certifi, chardet, @@ -37,7 +36,6 @@ buildPythonPackage rec { ]; dependencies = [ - brotlicffi certifi charset-normalizer idna From 9cc0e35e29e74f8f3b7b41826eacc3bac3a993d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Mar 2025 19:21:04 +0100 Subject: [PATCH 242/348] python313Packages.levenshtein: unvendor rapidfuzz-cpp --- pkgs/development/python-modules/levenshtein/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 5345deedeb0b..a218eec80568 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -20,8 +20,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; tag = "v${version}"; - hash = "sha256-YMXT0rfd7S4jisMdHqOrsHKLzQ2hm8UfxhIFU7BbWBQ="; - fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` + hash = "sha256-EFEyP7eqB4sUQ2ksD67kCr0BEShTiKWbk1PxXOUOGc4="; }; build-system = [ From d7836cdfe539981933363fe3fc661929d4570a52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Mar 2025 21:25:44 +0100 Subject: [PATCH 243/348] python313Packages.jinja2: 3.1.5 -> 3.1.6 https://github.com/pallets/jinja/blob/3.1.6/CHANGES.rst Fixes: CVE-2025-27516 --- pkgs/development/python-modules/jinja2/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index d9c5c674eb9e..ccd2577b09af 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -2,7 +2,6 @@ lib, stdenv, python, - pythonAtLeast, buildPythonPackage, pythonOlder, fetchPypi, @@ -21,14 +20,14 @@ buildPythonPackage rec { pname = "jinja2"; - version = "3.1.5"; + version = "3.1.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j+//jcMDTie7gNZ8Zx64qbxCTA70wIJu2/8wTM7/Q7s="; + hash = "sha256-ATf7BZkNNfEnWlh+mu5tVtqCH8g0kaD7g4GDvkP2bW0="; }; postPatch = '' From 781d80a3b7e10f1b814faecda437c34cd7d6e80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 5 Mar 2025 12:40:23 -0800 Subject: [PATCH 244/348] python313Packages.trove-classifiers: 2025.2.18.16 -> 2025.3.3.18 Changelog: https://github.com/pypa/trove-classifiers/releases/tag/2025.3.3.18 --- pkgs/development/python-modules/trove-classifiers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 731a34a513b9..c6c33f37ac57 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,7 +11,7 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2025.2.18.16"; + version = "2025.3.3.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-se4uFmhYkhfU7fUGdD4osYNNoSj4oSK61SLALYNwBuE="; + hash = "sha256-P/z6kKQorf3hpdkOOqG4f+R0xdvb9cy8p07Wm6g8XKc="; }; build-system = [ From f3490036f8dd77274399dc692576c08155e904d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Mar 2025 20:45:19 +0100 Subject: [PATCH 245/348] python313Packages.aiosqlite: 0.20.0 -> 0.21.0 https://github.com/omnilib/aiosqlite/blob/v0.21.0/CHANGELOG.md --- .../python-modules/aiosqlite/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index e96151d4df66..6c9e50a7dd6e 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -4,27 +4,24 @@ fetchFromGitHub, flit-core, pytestCheckHook, - pythonOlder, typing-extensions, }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.20.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "0.21.0"; + pyproject = true; src = fetchFromGitHub { owner = "omnilib"; - repo = pname; + repo = "aiosqlite"; tag = "v${version}"; - hash = "sha256-JQ9iNxK7FvBhPyr825d+8P5ZYFztDIX3gOwp4FPfyU4="; + hash = "sha256-3l/uR97WuLlkAEdogL9iYoXp89bsAcpH6XEtMELsX9o="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; homepage = "https://github.com/jreese/aiosqlite"; - changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/omnilib/aiosqlite/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; From d07b3403f7e6554b9e52438b69c6e862fb558b81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 03:19:28 +0100 Subject: [PATCH 246/348] python313Packages.isal: 1.7.1 -> 1.7.2 https://github.com/pycompression/python-isal/blob/v1.7.2/CHANGELOG.rst --- pkgs/development/python-modules/isal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 2626fe2e4ef5..bc4cca3eb2cd 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "isal"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-isal"; rev = "v${version}"; - hash = "sha256-KLnSE7QLM3q8DdoWnCEN6dOxsMr8eSH9k3FqFquZFlE="; + hash = "sha256-gvUVSGarPA4KupQTd61x75CfqNVqZfFC1zq0R21Clf8="; }; patches = [ From ef631cf20cb643d116e86275026292a796eb039c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Mar 2025 13:09:27 +0100 Subject: [PATCH 247/348] python313Packages.pip-tools: disable failing tests These are due to the pip 25.0 update. --- .../python-modules/pip-tools/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 9d44c2e383e0..b5491d6e3474 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pip-tools"; version = "7.4.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,9 +31,9 @@ buildPythonPackage rec { patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ build click pep517 @@ -68,6 +68,19 @@ buildPythonPackage rec { "test_cli_compile_all_extras_with_multiple_packages" # Deprecations "test_error_in_pyproject_toml" + + # pip 25.0 compat issues + # https://github.com/jazzband/pip-tools/issues/2112 + # requirement doesn't end with semicolon + "test_resolver" + "test_resolver__custom_unsafe_deps" + # constraints.txt is now in a tmpdir + "test_preserve_via_requirements_constrained_dependencies_when_run_twice" + "test_annotate_option" + # TypeError("'<' not supported between instances of 'InstallationCandidate' and 'InstallationCandidate'")>.exit_code + "test_no_candidates" + "test_no_candidates_pre" + "test_failure_of_legacy_resolver_prompts_for_backtracking" ]; pythonImportsCheck = [ "piptools" ]; From 97adbc53141e5e578786db52783f8ef64369911b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Mar 2025 17:41:18 +0100 Subject: [PATCH 248/348] python313Packages.google-resumable-media: provide brotli for tests --- .../python-modules/google-resumable-media/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index d8ea529bb1d8..7323ae9bc69d 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + brotli, buildPythonPackage, fetchPypi, google-auth, @@ -40,6 +41,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + brotli google-cloud-testutils mock pytest-asyncio From ee1ce3007528d02c5e8ad45e16e3124f95522080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Mar 2025 08:57:29 -0800 Subject: [PATCH 249/348] python313Packages.jeepney: 0.8.0 -> 0.9 Diff: https://gitlab.com/takluyver/jeepney/-/compare/0.8...0.9 Changelog: https://gitlab.com/takluyver/jeepney/-/blob/0.9/docs/release-notes.rst --- .../python-modules/jeepney/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index fafcfb0df3d8..0455732a5a83 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, pythonOlder, flit-core, async-timeout, @@ -15,18 +15,17 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.8.0"; + version = "0.9"; + pyproject = true; - disabled = pythonOlder "3.7"; - - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - sha256 = "5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"; + src = fetchFromGitLab { + owner = "takluyver"; + repo = "jeepney"; + tag = version; + hash = "sha256-d8w/4PtDviTYDHO4EwaVbxlYk7CXtlv7vuR+o4LhfRs="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ async-timeout @@ -57,6 +56,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://gitlab.com/takluyver/jeepney/-/blob/${src.tag}/docs/release-notes.rst"; homepage = "https://gitlab.com/takluyver/jeepney"; description = "Pure Python DBus interface"; license = licenses.mit; From c83260dfa40f777bc1d5b1a06c938c912ea39b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Mar 2025 09:21:41 -0800 Subject: [PATCH 250/348] python313Packages.tzlocal: 5.3 -> 5.3.1 Changelog: https://github.com/regebro/tzlocal/blob/5.3.1/CHANGES.txt --- pkgs/development/python-modules/tzlocal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 427d31ccbcb7..6f100cfb5a7a 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "5.3"; # version needs to be compatible with APScheduler + version = "5.3.1"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-L6+/wH6di0mt4Y+JjWvNN66IzjrWSGhCouTwOvaDI9I="; + hash = "sha256-zO/8ft7O/qH1lVQdvW6ZDLHqPRm/AbKAnzYqA915If0="; }; nativeBuildInputs = [ setuptools ]; From aee4e5681e8fe94c513c47000baf71bbc5095cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Mar 2025 10:16:06 -0800 Subject: [PATCH 251/348] python313Packages.ibm-cloud-sdk-core: enable previously failing tests --- .../ibm-cloud-sdk-core/default.nix | 41 ++++++++----------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index a89c1d4c5271..93ca544d6ae6 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -41,33 +41,24 @@ buildPythonPackage rec { responses ]; - disabledTests = - [ - # Various tests try to access credential files which are not included with the source distribution - "test_configure_service" - "test_cp4d_authenticator" - "test_cwd" - "test_files_dict" - "test_files_duplicate_parts" - "test_files_list" - "test_get_authenticator" - "test_gzip_compression_external" - "test_iam" - "test_read_external_sources_2" - "test_retry_config_external" - # assertion error due to requests brotli support - "test_http_client" - # Tests require network access - "test_tls_v1_2" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # Tests are blocking or failing - "test_abstract_class_instantiation" - "test_abstract_class_instantiation" - ]; + disabledTests = [ + # Various tests try to access credential files which are not included with the source distribution + "test_configure_service" + "test_cp4d_authenticator" + "test_cwd" + "test_files_dict" + "test_files_duplicate_parts" + "test_files_list" + "test_get_authenticator" + "test_gzip_compression_external" + "test_iam" + "test_read_external_sources_2" + "test_retry_config_external" + # Tests require network access + "test_tls_v1_2" + ]; disabledTestPaths = [ - "test/test_container_token_manager.py" # Tests require credentials "test_integration/" ]; From 817232292be9a9364b35676f22280cb4839fa57e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 11:05:10 +0100 Subject: [PATCH 252/348] python313Packages.types-setuptools: 75.8.0.20250110 -> 75.8.2.20250305 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index cfea4f817fd9..88001456803a 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "75.8.0.20250110"; + version = "75.8.2.20250305"; pyproject = true; src = fetchPypi { pname = "types_setuptools"; inherit version; - hash = "sha256-lvfsi71uClTqGA1mrWiteh15VOcoGnEOot5141VUUnE="; + hash = "sha256-qYcmm0lIjyGWGh2Zqo0oG2EWJYg972OSqThVsxVE5AU="; }; nativeBuildInputs = [ setuptools ]; From 53093f51d9fae6793f4f158a2f9aa80f974090aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 11:07:50 +0100 Subject: [PATCH 253/348] python313Packages.teamcity-messages: refactor --- .../python-modules/teamcity-messages/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index da1738716d4b..d2c43108acd3 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -4,22 +4,25 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "teamcity-messages"; version = "1.33"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JetBrains"; - repo = pname; + repo = "teamcity-messages"; tag = "v${version}"; hash = "sha256-BAwAfe54J+gbbiz03Yiu3eC/9RnI7P0mfR3nfM1oKZw="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/unit-tests/" ]; @@ -29,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python unit test reporting to TeamCity"; homepage = "https://github.com/JetBrains/teamcity-messages"; + changelog = "https://github.com/JetBrains/teamcity-messages/releases/tag/v${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From c51326e684eaffd8fcd6913537a084615012ab46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:23:04 +0100 Subject: [PATCH 254/348] python313Packages.google-cloud-testutils: 1.5.0 -> 1.6.0 Changelog: https://github.com/googleapis/python-test-utils/blob/v1.6.0/CHANGELOG.md --- .../python-modules/google-cloud-testutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 5d191bfc25ee..c5b6f750cbb3 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_testutils"; inherit version; - hash = "sha256-ds2JgVD7rbW1A6ce41hJEodqJdtWT2wiPIuvswp3kag="; + hash = "sha256-wuCpUpc5Iny6MFoh7u9d175wL9DWHz4ZLM1f+DE+V6U="; }; propagatedBuildInputs = [ From e079830d67bd5e5a12c46e16cfccd445e3d8f963 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 11:44:01 +0100 Subject: [PATCH 255/348] python313Packages.types-decorator: 5.1.8.20240310 -> 5.2.0.20250224 --- .../python-modules/types-decorator/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 88874e3be565..6f3cdd6c4a13 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.20240310"; + version = "5.2.0.20250224"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-UuMWsDeDiGqKKr3CKPcHFoC6ZYlFRc0ghevjz4hoSg4="; + pname = "types_decorator"; + inherit version; + hash = "sha256-1oqi9Vz1BFEN19AbSeaN0yw6IA0LwMu4RZXboaEZVP8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules doesn't have tests doCheck = false; From 4af0a956e5fa6b2fe6a6f9cea5a3bf6c445b8e9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 12:13:43 +0100 Subject: [PATCH 256/348] python313Packages.webtest: 3.0.3 -> 3.0.4 --- pkgs/development/python-modules/webtest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 706cf030e930..1759284570c1 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "webtest"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tjX2/mWEvJc3SWtocVXpNz89AbyxtGFpAH2g97piOPk="; + hash = "sha256-lHeNGaN+Wr1ziNrU2Th0QQ7M7VOhc5qOX/Lby6HPwMQ="; }; build-system = [ setuptools ]; From aee7f577855aec5d9511679bc113c12abd2dfa75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 13:31:29 +0100 Subject: [PATCH 257/348] python313Packages.websockets: 15.0 -> 15.0.1 Diff: https://github.com/aaugustin/websockets/compare/refs/tags/15.0...15.0.1 Changelog: https://github.com/aaugustin/websockets/blob/15.0.1/docs/project/changelog.rst --- pkgs/development/python-modules/websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 711f3fdec697..50b2c11c4b53 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "websockets"; - version = "15.0"; + version = "15.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "aaugustin"; repo = "websockets"; tag = version; - hash = "sha256-PlR2a0KNycdq/FhUX0qpthrrRckuE61FYV4uqHOMsY0="; + hash = "sha256-DC1nK+TvCoCqchyWJOyT4Ul4gkTYXixu7XmTqvytqEo="; }; build-system = [ setuptools ]; From 6d085e0dffc542aa36c81289930fd52ba13b5655 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 13:41:08 +0100 Subject: [PATCH 258/348] python313Packages.types-deprecated: 1.2.15.20241117 -> 1.2.15.20250304 --- .../python-modules/types-deprecated/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix index 3d26a47ee404..e6cde7039037 100644 --- a/pkgs/development/python-modules/types-deprecated/default.nix +++ b/pkgs/development/python-modules/types-deprecated/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.15.20241117"; + version = "1.2.15.20250304"; pyproject = true; src = fetchPypi { - pname = "types-Deprecated"; + pname = "types_deprecated"; inherit version; - hash = "sha256-kkACyLf93sUbpJSXiKcCQRouNjbNmyozq9juEZcB134="; + hash = "sha256-wykDBVMCneXMbLMPJpwR9OAOWYxCQSkBefY82n0z9xk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules has no tests doCheck = false; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Typing stubs for Deprecated"; homepage = "https://pypi.org/project/types-Deprecated/"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From 643b1376801cf83e0644f88e74e3c7d20e22f245 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 16:45:02 +0100 Subject: [PATCH 259/348] python313Packages.types-lxml: 2024.12.13 -> 2025.03.04 Diff: https://github.com/abelcheung/types-lxml/compare/refs/tags/2024.12.13...2025.03.04 Changelog: https://github.com/abelcheung/types-lxml/releases/tag/2025.03.04 --- .../python-modules/types-lxml/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index df4ed0262b68..df8cc5976f63 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -5,29 +5,30 @@ cssselect, fetchFromGitHub, html5lib, + hypothesis, lxml, + mypy, pdm-backend, + pook, pyright, pytestCheckHook, - pythonOlder, typeguard, types-beautifulsoup4, + types-html5lib, typing-extensions, - hypothesis, + urllib3, }: buildPythonPackage rec { pname = "types-lxml"; - version = "2024.12.13"; + version = "2025.03.04"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-iqIOwQIg6EB/m8FIoUzkvh1W0w4bKmS9zi4Z+5qlC+0="; + hash = "sha256-dA9sspqEChHarwk2LrK2F7Ehri2ffjOlGk3nj4KFsfU="; }; build-system = [ pdm-backend ]; @@ -35,18 +36,25 @@ buildPythonPackage rec { dependencies = [ cssselect types-beautifulsoup4 + types-html5lib typing-extensions ]; + optional-dependencies = { + mypy = [ mypy ]; + pyright = [ pyright ]; + }; + nativeCheckInputs = [ beautifulsoup4 html5lib hypothesis lxml - pyright + pook pytestCheckHook typeguard - ]; + urllib3 + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "lxml-stubs" ]; From d8f2840f89ca1dac22526f179c14c0ca709703fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 16:49:41 +0100 Subject: [PATCH 260/348] python313Packages.pytest-codspeed: 3.1.2 -> 3.2.0 Diff: https://github.com/CodSpeedHQ/pytest-codspeed/compare/refs/tags/v3.1.2...v3.2.0 Changelog: https://github.com/CodSpeedHQ/pytest-codspeed/releases/tag/v3.2.0 --- pkgs/development/python-modules/pytest-codspeed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index 2d042bff058f..dbf611fa5b1a 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pytest-codspeed"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "pytest-codspeed"; tag = "v${version}"; - hash = "sha256-HtjfXA5Ifs2ytheHOb0HUM62foBYFEMwsV4h9lTNd38="; + hash = "sha256-SNVJtnanaSQTSeX3EFG+21GFC1WFCQTbaNyi7QjQROw="; }; build-system = [ hatchling ]; From 797ed86270b4192e4e2cf3c66029eabcce6861de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 16:50:06 +0100 Subject: [PATCH 261/348] python313Packages.pytest-httpserver: 1.1.0 -> 1.1.2 Diff: https://github.com/csernazs/pytest-httpserver/compare/refs/tags/1.1.0...1.1.2 Changelog: https://github.com/csernazs/pytest-httpserver/blob/1.1.2/CHANGES.rst --- pkgs/development/python-modules/pytest-httpserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 8f64b14c6d71..6a136e9d3c05 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = "pytest-httpserver"; tag = version; - hash = "sha256-BkdbCrpZKjHYikZk1mL4iSGe5gRjWUVN/w222QkmFLQ="; + hash = "sha256-41JrZ3ubaJHNzwGDWUSseJ3Z405k21SOpwW7jG5rNxg="; }; nativeBuildInputs = [ poetry-core ]; From 853193d3d0614f29e750abceb9a274f80320616a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 16:53:11 +0100 Subject: [PATCH 262/348] python313Packages.types-requests: 2.32.0.20241016 -> 2.32.0.20250306 --- pkgs/development/python-modules/types-requests/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 124bcfe8874f..dfc2d80fdefd 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20241016"; + version = "2.32.0.20250306"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-DZytLydRXQ4+PacTShtvKPuXEp2GuGfyTZxyZFJjTZU="; + pname = "types_requests"; + inherit version; + hash = "sha256-CWI1JpTsWy+V/ah37mChWavfhKD8b9rOWZ8grLQaA9E="; }; build-system = [ setuptools ]; From bb597aa10a6c206f385a4bbb2a0a0e6e9778aeff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Mar 2025 11:58:13 +0100 Subject: [PATCH 263/348] python313Packages.pyelftools: 0.31 -> 0.32 Diff: https://github.com/eliben/pyelftools/compare/refs/tags/v0.31...v0.32 Changelog: https://github.com/eliben/pyelftools/blob/v0.32/CHANGES --- pkgs/development/python-modules/pyelftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 783951abde8b..e4ec7a9b55d0 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.31"; + version = "0.32"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "eliben"; repo = "pyelftools"; tag = "v${version}"; - hash = "sha256-kX89fMXqrEvhMAAjqKHzHmrYizKBt1uCWMOJtFNNhy4="; + hash = "sha256-58Twjf7ECOPynQ5KPCTDQWdD3nb7ADJZISozWGRGoXM="; }; build-system = [ setuptools ]; From 7d8ac0b40d722ecbb1990ef59858c14f84a521ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 17:23:17 +0100 Subject: [PATCH 264/348] python313Packages.python-fsutil: 0.14.1 -> 0.15.0 Changelog: https://github.com/fabiocaccamo/python-fsutil/blob/0.15.0/CHANGELOG.md --- .../python-modules/python-fsutil/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index ecc7cbd02df8..f88377959251 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -10,26 +10,24 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-fsutil"; tag = version; - hash = "sha256-Cs78zpf3W5UZJkkUBEP6l6fi2J4OtJXGvqqQ8PWKx+8="; + hash = "sha256-hzPNj6hqNCnMx1iRK1c6Y70dUU/H4u6o+waEgOhyhuA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/test.py" ]; - disabledTests = [ # Tests require network access "test_download_file" From 053fa6b69cbbfb49f3b270e92464cffc55dcf21d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 18:03:44 +0100 Subject: [PATCH 265/348] python313Packages.cached-ipaddress: 0.9.2 -> 0.10.0 Diff: https://github.com/bdraco/cached-ipaddress/compare/refs/tags/v0.9.2...v0.10.0 Changelog: https://github.com/bdraco/cached-ipaddress/blob/refs/tags/v0.10.0/CHANGELOG.md --- pkgs/development/python-modules/cached-ipaddress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index 4ef791086c42..8843d82df51b 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.9.2"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; tag = "v${version}"; - hash = "sha256-ojPza3DeeAJgUO0OS1J5YXTtzNWqLUf6YiOG9hohc+A="; + hash = "sha256-g6ffp08SXckCJthGICeuEqZ71XeLklKmz6Ziz/AHBOg="; }; build-system = [ From b39ec7715053b0d6f915169da114e11059c2e85d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 17:55:47 +0100 Subject: [PATCH 266/348] python313Packages.inline-snapshot: 0.19.3 -> 0.20.5 Changelog: https://github.com/15r10nk/inline-snapshot/blob/0.20.5/CHANGELOG.md --- pkgs/development/python-modules/inline-snapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index 84cf1fe0faf9..03f450d6dd10 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.19.3"; + version = "0.20.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "15r10nk"; repo = "inline-snapshot"; tag = version; - hash = "sha256-bgzDjlcZOxS3OCv8xj7qKllaZcfJaxySXOu7OwY2EIQ="; + hash = "sha256-hIOavNdD2SaYuvG1rdlIkVRALjaJDfXkanrlF9TcPo0="; }; build-system = [ hatchling ]; From 815ae05b8d1899ba68058dc0fc2fa194d705a53d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 19:49:32 +0100 Subject: [PATCH 267/348] python313Packages.pytest-httpbin: 2.0.0 -> 2.1.0 Diff: https://github.com/kevin1024/pytest-httpbin/compare/refs/tags/v2.0.0...v2.1.0 Changelog: https://github.com/kevin1024/pytest-httpbin/releases/tag/v2.1.0 --- pkgs/development/python-modules/pytest-httpbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index e8971271a397..99146020d6ca 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kevin1024"; repo = "pytest-httpbin"; tag = "v${version}"; - hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4="; + hash = "sha256-gESU1SDpqSQs8GRcGJclWM0WpS4DZicfdtwxk2sQubQ="; }; build-system = [ setuptools ]; From 2ea47e5b736c6dd18712ff35cae4da7fc596e52b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 19:53:31 +0100 Subject: [PATCH 268/348] python313Packages.pkg-about: 1.1.8 -> 1.2.9 Changelog: https://github.com/karpierz/pkg_about/blob/1.2.9/CHANGES.rst --- .../python-modules/pkg-about/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index e99565720026..0ad54bbd83fb 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -1,28 +1,27 @@ { lib, buildPythonPackage, + docutils, fetchPypi, pythonOlder, importlib-metadata, importlib-resources, setuptools, packaging, - tomli, pytestCheckHook, }: buildPythonPackage rec { pname = "pkg-about"; - version = "1.1.8"; - format = "pyproject"; + version = "1.2.9"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "pkg_about"; inherit version; - extension = "zip"; - hash = "sha256-GVV3l0rU8gkxedOiMVVAt0bEqCtyO+1LSHxIKjBlbPk="; + hash = "sha256-NXty1yFvBLSpN5e3/KNCMOU+owkCTBaX0KINzVrUgzM="; }; # tox is listed in build requirements but not actually used to build @@ -31,17 +30,17 @@ buildPythonPackage rec { sed -i "/requires/s/, 'tox>=[^']*'//" pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ packaging setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + docutils importlib-metadata importlib-resources packaging setuptools - tomli ]; nativeCheckInputs = [ pytestCheckHook ]; From c12963b600a525af42117277e4dce55e671f52f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 20:13:47 +0100 Subject: [PATCH 269/348] python313Packages.types-mock: 5.1.0.20240425 -> 5.2.0.20250306 --- pkgs/development/python-modules/types-mock/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index 37b313bc59e9..0f9dac90ddd8 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.20240425"; + version = "5.2.0.20250306"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-UoGmRdcugn1wBD48wUT+M7HAA9sIT3idwgOqkOgSpaQ="; + pname = "types_mock"; + inherit version; + hash = "sha256-FYgstc+ZgFh6dgfjGJCAEiOAHXmX9VloaAXOCbZTYIc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; From a70dde28b172da13ce1c6fa326f71ea731e68f69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 20:14:23 +0100 Subject: [PATCH 270/348] python313Packages.types-psutil: 6.1.0.20241221 -> 7.0.0.20250218 --- pkgs/development/python-modules/types-psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 2284290e8f69..7d9e9eb9de4d 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "6.1.0.20241221"; + version = "7.0.0.20250218"; format = "setuptools"; src = fetchPypi { pname = "types_psutil"; inherit version; - hash = "sha256-YA9aNr1eDriIfw4/P/LPFU2QaQrYEjyKcHu6SrlNMYU="; + hash = "sha256-HmQs2v6DeyQClbI7HL1GkdgLCKB9KZMhQ8u64w6w25w="; }; # Module doesn't have tests From f3ddcb4acb4591f67673b4e2f87e70e320838d19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 20:15:45 +0100 Subject: [PATCH 271/348] python313Packages.types-psycopg2: 2.9.21.20241019 -> 2.9.21.20250121 --- .../python-modules/types-psycopg2/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 19234ab8ae0c..31c8d6091516 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20241019"; + version = "2.9.21.20250121"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-vKibmI0uvRm80IsXfSKod+qLhB3ssQ7RMK/POUBGEvo="; + pname = "types_psycopg2"; + inherit version; + hash = "sha256-Kw4s0PN0evGuJacCeJhxbYAglgR3DvPL81D+BVucNJs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "psycopg2-stubs" ]; From e495ba108f2c458e155e4bca96383fd8919ead6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 20:16:38 +0100 Subject: [PATCH 272/348] python313Packages.pkginfo: 1.12.0 -> 1.12.1.2 Changelog: https://pypi.org/project/pkginfo/#pkginfo-changelog --- pkgs/development/python-modules/pkginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 0048c0a12607..da9483a54b5d 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.12.0"; + version = "1.12.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-itkaBEWgNngrk2bvi4wsUCkfg6VTR4uoWAxz0yFXAM8="; + hash = "sha256-XNlXgkrDbxQCYJZOujxr5kQqg1m4xI9K35AhDzOgS3s="; }; build-system = [ setuptools ]; From 0609038722039c76ca5f53c2583923eeed69d577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 22:14:29 +0100 Subject: [PATCH 273/348] python313Packages.tokenize-rt: 5.2.0 -> 6.1.0 Diff: https://github.com/asottile/tokenize-rt/compare/v5.2.0...v6.1.0 --- pkgs/development/python-modules/tokenize-rt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 1634f7681363..b3e994e26020 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tokenize-rt"; - version = "5.2.0"; + version = "6.1.0"; pyproject = true; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-G4Dn6iZLVOovzfEt9eMzp93mTX+bo0tHI5cCbaJLxBQ="; + hash = "sha256-7ykczY73KkqR99tYLL/5bgr9bqU444qHs2ONz+ldVyg="; }; nativeBuildInputs = [ setuptools ]; From a78fdd9828f758123a0b1822fd4ad12b33536a8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 22:14:42 +0100 Subject: [PATCH 274/348] python313Packages.pyupgrade: 3.15.0 -> 3.19.1 Diff: https://github.com/asottile/pyupgrade/compare/v3.15.0...v3.19.1 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index f5a4ad76af47..a2e0af522d83 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "3.15.0"; + version = "3.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-n6WlJc7Hh7SArJ8Z0fikxidtpXaPQvKTDGn6HukL2q8="; + hash = "sha256-bijW1uxoaVKLO0Psv3JeAG6rKeTwGa9ZW06VU1qFrrU="; }; propagatedBuildInputs = [ tokenize-rt ]; From 95644f4f5fada9d4c64fe53e26e4207c08bac99e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Mar 2025 11:14:20 +0100 Subject: [PATCH 275/348] python313Packages.bitarray: refactor --- pkgs/development/python-modules/bitstring/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index a1c17c7a4aff..3f750ea48eca 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-0AaOVjroVb/maFBaB55ahwWyRHHnofja4pgSgjQMsT8="; }; + pythonRelaxDeps = [ "bitarray" ]; + build-system = [ setuptools ]; dependencies = [ bitarray ]; @@ -47,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; + changelog = "https://github.com/scott-griffiths/bitstring/releases/tag/${src.tag}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; From 8640fad51e6f0ff91751525249a814b0262e1240 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Mar 2025 22:32:50 +0100 Subject: [PATCH 276/348] python313Packages.gcsfs: fix src hash --- pkgs/development/python-modules/gcsfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index a6d230bbe8d3..636294561dcc 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "gcsfs"; tag = version; - hash = "sha256-1nPhttEmGI8jreMe5hwOZRALJa5QTNOw2McisV+cR54="; + hash = "sha256-CXv0SbwOaEjD5HkJgPRfGk+VfciDjpvwomM5oCi6VIw="; }; build-system = [ From 1670c945104321e96989b2c175bf8a74b85071ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 12:17:15 +0100 Subject: [PATCH 277/348] python313Packages.django_4: 4.2.19 -> 4.2.20 https://docs.djangoproject.com/en/4.2/releases/4.2.20/ https://www.djangoproject.com/weblog/2025/mar/06/security-releases Fixes: CVE-2025-26699 --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index b5183c00d9dd..f1e54fc8dd9a 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.19"; + version = "4.2.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-aSTrtZs8WyZ/wr01N7Mi7M3A8MlZ6rB9fBuMdCkKkok="; + hash = "sha256-RmClB0ntPzcUzsy1lKn3G5IUoNiXiYuM+/LLj0JyFfQ="; }; patches = From a83922bf152256337ef85398f862fef83bd11867 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 12:21:40 +0100 Subject: [PATCH 278/348] python312Packages.ansible-core: 2.18.2 -> 2.18.3 https://github.com/ansible/ansible/blob/v2.18.3/changelogs/CHANGELOG-v2.18.rst --- .../python-modules/ansible/core.nix | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 5c6bf0175247..7cf89891c004 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -8,7 +8,6 @@ setuptools, ansible, cryptography, - importlib-resources, jinja2, junit-xml, lxml, @@ -16,7 +15,6 @@ packaging, paramiko, ansible-pylibssh, - passlib, pexpect, psutil, pycrypto, @@ -31,13 +29,15 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.18.2"; + version = "2.18.3"; pyproject = true; + disabled = pythonOlder "3.11"; + src = fetchPypi { pname = "ansible_core"; inherit version; - hash = "sha256-clsEfTWUIwTrMi65NLmMxUQqw/SdM4J9lxccI4xLabk="; + hash = "sha256-jE6spAhFI44mAbm8nb+9T27TUCy4smMnifdc5Hir/e4="; }; # ansible_connection is already wrapped, so don't pass it through @@ -66,34 +66,30 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - [ - # depend on ansible instead of the other way around - ansible - # from requirements.txt - cryptography - jinja2 - packaging - passlib - pyyaml - resolvelib - # optional dependencies - junit-xml - lxml - ncclient - paramiko - ansible-pylibssh - pexpect - psutil - pycrypto - requests - scp - xmltodict - ] - ++ lib.optionals windowsSupport [ pywinrm ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]; + dependencies = [ + # depend on ansible instead of the other way around + ansible + # from requirements.txt + cryptography + jinja2 + packaging + pyyaml + resolvelib + # optional dependencies + junit-xml + lxml + ncclient + paramiko + ansible-pylibssh + pexpect + psutil + pycrypto + requests + scp + xmltodict + ] ++ lib.optionals windowsSupport [ pywinrm ]; - pythonRelaxDeps = lib.optionals (pythonOlder "3.10") [ "importlib-resources" ]; + pythonRelaxDeps = [ "resolvelib" ]; postInstall = '' export HOME="$(mktemp -d)" From 1a9f4af0e3003b5cb25bb989e59f54081951960f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 12:57:51 +0100 Subject: [PATCH 279/348] python312Packages.ansible: 11.2.0 -> 11.3.0 https://github.com/ansible-community/ansible-build-data/blob/11.3.0/11/CHANGELOG-v11.rst --- .../python-modules/ansible/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 893a4f569b90..df8c6e7b8400 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -3,6 +3,7 @@ pythonOlder, buildPythonPackage, fetchPypi, + setuptools, jsonschema, jxmlease, ncclient, @@ -22,25 +23,27 @@ let pname = "ansible"; - version = "11.2.0"; + version = "11.3.0"; in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-XFbXubyf2F+iDxT0gB6ImkWnq4O7EXdq11no+mdRCtQ="; + hash = "sha256-kLQJ9jDcbVWCJECaOUgxTt4bzabbLQPBdwjO9hF6YQM="; }; - postPatch = '' - # we make ansible-core depend on ansible, not the other way around - sed -Ei '/ansible-core/d' setup.py - ''; + # we make ansible-core depend on ansible, not the other way around, + # since when you install ansible-core you will not have ansible + # executables installed in the PATH variable + pythonRemoveDeps = [ "ansible-core" ]; - propagatedBuildInputs = lib.unique ( + build-system = [ setuptools ]; + + dependencies = lib.unique ( [ # Support ansible collections by default, make all others optional # ansible.netcommon @@ -62,7 +65,7 @@ buildPythonPackage { # add the dependencies for the collections you need conditionally and install # ansible using overrides to enable the collections you need. ] - ++ lib.optionals (withJunos) [ + ++ lib.optionals withJunos [ # ansible_collections/junipernetworks/junos/requirements.txt jxmlease ncclient @@ -71,7 +74,7 @@ buildPythonPackage { scp xmltodict ] - ++ lib.optionals (withNetbox) [ + ++ lib.optionals withNetbox [ # ansible_collections/netbox/netbox/pyproject.toml pynetbox ] From 8a5ff433c5384904be8985b31f6e088da946e312 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 14:15:23 +0100 Subject: [PATCH 280/348] python313Packages.aioambient: relax poetry-core constraint --- pkgs/development/python-modules/aioambient/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 4b3cf7666f89..38748883558e 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-F1c2S0c/CWHeCd24Zc8ib3aPR7yj9gCPBJpmpgoddQY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry-core==" "poetry-core>=" + ''; + build-system = [ poetry-core ]; dependencies = [ From 64ac8bb7b56f66835e94ad071ff81d7974d70bfb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 14:43:18 +0100 Subject: [PATCH 281/348] python313Packages.google-genai: relax websockets constraint --- pkgs/development/python-modules/google-genai/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index ff0bb2113fdf..e069c41cb882 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "websockets" ]; + dependencies = [ google-auth httpx From a2797cf311935ff521e5661822a71f278abf19cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 16:08:54 +0100 Subject: [PATCH 282/348] Revert "python313Packages.beautifulsoup4: 4.12.3 -> 4.13.3" This reverts commit c1075e3e4b8f332815873ebaadedc22664babd9d. API breakage that is visible in django-compressor. --- .../python-modules/beautifulsoup4/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index c04050c54d81..a0fbb4ade834 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, chardet, hatchling, html5lib, @@ -10,7 +11,6 @@ pythonOlder, soupsieve, sphinxHook, - typing-extensions, # for passthru.tests html-sanitizer, @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.13.3"; + version = "4.12.3"; pyproject = true; outputs = [ @@ -35,17 +35,25 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-G9MkBdrMkgtCuDugFkR0ftd0VqZXYOKF+8R2M87dr4s="; + hash = "sha256-dOPRko7cBw0hdIGFxG4/szSQ8i9So63e6a7g9Pd4EFE="; }; - build-system = [ hatchling ]; + patches = [ + (fetchpatch { + name = "tests.patch"; + url = "https://git.launchpad.net/beautifulsoup/patch/?id=9786a62726de5a8caba10021c4d4a58c8a3e9e3f"; + hash = "sha256-FOMoJjT0RgqKjbTLN/qCuc0HjhKeenMcgwb9Fp8atAY="; + }) + ]; - nativeBuildInputs = [ sphinxHook ]; + nativeBuildInputs = [ + hatchling + sphinxHook + ]; - dependencies = [ + propagatedBuildInputs = [ chardet soupsieve - typing-extensions ]; optional-dependencies = { @@ -55,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "bs4" ]; From 34a6177766d7fd4b1e7dca622a83aa3c74bf7f93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 17:12:43 +0100 Subject: [PATCH 283/348] python313Packages.aioguardian: relax poetry-core constraint --- pkgs/development/python-modules/aioguardian/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 6b20a14f4043..115b5e4e632d 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-RoVD2O/OAk4l96kYEq7ZM/2QuckcPxDluf1MT4HdKc4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry-core==" "poetry-core>=" + ''; + pythonRelaxDeps = [ "asyncio_dgram" "typing-extensions" From 11d98fc97a911e3f338a4987035421282cb076ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 17:27:59 +0100 Subject: [PATCH 284/348] poetry-unwrapped: disable failing test --- pkgs/by-name/po/poetry/unwrapped.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 21a7e9032ccb..0ef2a0f2ee9e 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -142,6 +142,12 @@ buildPythonPackage rec { "test_env_system_packages_are_relative_to_lib" "test_install_warning_corrupt_root" "test_project_plugins_are_installed_in_project_folder" + "test_application_command_not_found_messages" + # PermissionError: [Errno 13] Permission denied: '/build/pytest-of-nixbld/pytest-0/popen-gw3/test_find_poetry_managed_pytho1/.local/share/pypoetry/python/pypy@3.10.8/bin/python' + "test_list_poetry_managed" + "test_list_poetry_managed" + "test_find_all_with_poetry_managed" + "test_find_poetry_managed_pythons" ]; pytestFlagsArray = [ From 9737b565d1d25d1e82d6b19671b6b6c729328546 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 17:50:48 +0100 Subject: [PATCH 285/348] python313Packages.booleanoperations: disable failing tests --- .../python-modules/booleanoperations/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index 9ade956db688..f0d01e3756e5 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -41,6 +41,18 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # started failing with fonttools update from 4.55.3 -> 4.56.0 + "test_QTail_reversed_difference" + "test_QTail_reversed_intersection" + "test_QTail_reversed_union" + "test_QTail_reversed_xor" + "test_Q_difference" + "test_Q_intersection" + "test_Q_union" + "test_Q_xor" + ]; + meta = { description = "Boolean operations on paths"; homepage = "https://github.com/typemytype/booleanOperations"; From 50a77dfd1969ffc89d5a0fdbb48e4261ce57140e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 17:59:52 +0100 Subject: [PATCH 286/348] python313Packages.click-option-group: disable failing test --- pkgs/development/python-modules/click-option-group/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix index 11de4c4bc52e..0acc8f69db31 100644 --- a/pkgs/development/python-modules/click-option-group/default.nix +++ b/pkgs/development/python-modules/click-option-group/default.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # https://github.com/click-contrib/click-option-group/issues/65 + disabledTests = [ "test_missing_group_decl_first_api" ]; + pythonImportsCheck = [ "click_option_group" ]; meta = with lib; { From 5562267baef7d190be1cb6523917dd293e630fc8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 18:00:04 +0100 Subject: [PATCH 287/348] python313Packages.click-option-group: refactor --- .../python-modules/click-option-group/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix index 0acc8f69db31..5d51836c69ff 100644 --- a/pkgs/development/python-modules/click-option-group/default.nix +++ b/pkgs/development/python-modules/click-option-group/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, click, pytestCheckHook, }: @@ -10,17 +11,20 @@ buildPythonPackage rec { pname = "click-option-group"; version = "0.5.6"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "click-contrib"; - repo = pname; + repo = "click-option-group"; tag = "v${version}"; hash = "sha256-uR5rIZPPT6pRk/jJEy2rZciOXrHWVWN6BfGroQ3znas="; }; - propagatedBuildInputs = [ click ]; + build-system = [ setuptools ]; + + dependencies = [ click ]; nativeCheckInputs = [ pytestCheckHook ]; From 07e5273666223add8ca5a3231bce6075be183b31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Mar 2025 18:15:07 +0100 Subject: [PATCH 288/348] python313Packages.sanic: fix websockets 14.2 compat --- pkgs/development/python-modules/sanic/default.nix | 3 +++ .../sanic/websockets-14.2-compat.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/python-modules/sanic/websockets-14.2-compat.patch diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 0a9d5f4ccc9c..e2373ad00b69 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { hash = "sha256-17Nr0iNeZC1sHm0JETIufdMVqrhORts1WxCh8cukCKg="; }; + # https://github.com/sanic-org/sanic/issues/3031 + patches = [ ./websockets-14.2-compat.patch ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch new file mode 100644 index 000000000000..9acf47757335 --- /dev/null +++ b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch @@ -0,0 +1,13 @@ +diff --git a/sanic/server/protocols/websocket_protocol.py b/sanic/server/protocols/websocket_protocol.py +index beee1d26..5a3e70f2 100644 +--- a/sanic/server/protocols/websocket_protocol.py ++++ b/sanic/server/protocols/websocket_protocol.py +@@ -147,7 +147,7 @@ class WebSocketProtocol(HttpProtocol): + "".join([f"{k}: {v}\r\n" for k, v in resp.headers.items()]) + ).encode() + rbody += b"\r\n" +- if resp.body is not None: ++ if resp.body: + rbody += resp.body + rbody += b"\r\n\r\n" + await super().send(rbody) From aea34c87ce79cf88a7d5fa3e4058088959c83989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 9 Mar 2025 21:03:29 +0100 Subject: [PATCH 289/348] mediagoblin: fix build by avoiding kombu tests --- pkgs/by-name/me/mediagoblin/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 309b4abe50c5..af2ed13dce4b 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -15,6 +15,12 @@ let celery = prev.celery.overridePythonAttrs { doCheck = false; }; + + kombu = prev.kombu.overridePythonAttrs { + # avoid conflicts with test only dependencies + doCheck = false; + }; + sqlalchemy = prev.sqlalchemy_1_4; }; }; From fb6db3dff8e7ddda3ea52b65f1bdc413b137404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 9 Mar 2025 21:03:55 +0100 Subject: [PATCH 290/348] python313Packages.wtforms-sqlalchemy: fix build system --- .../development/python-modules/wtforms-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix index b4bb6534a58d..d60a9aa186e2 100644 --- a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, pytestCheckHook, - setuptools, sqlalchemy, wtforms, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { }; build-system = [ - setuptools + hatchling ]; dependencies = [ From 10c078540433a8dbfc67787ef915d3e5fd1fcd1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 08:25:04 +0100 Subject: [PATCH 291/348] pretix: relax pypdf constraint --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index db4805612854..c5baa51d8dbe 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -103,6 +103,7 @@ python.pkgs.buildPythonApplication rec { "protobuf" "pycryptodome" "pyjwt" + "pypdf" "python-bidi" "qrcode" "redis" From 5f8071e7f35e5ac8eace5ead86b1a5962eafd63b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 08:51:46 +0100 Subject: [PATCH 292/348] python312Packages.karton-core: relax boto3 constraint --- pkgs/development/python-modules/karton-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 1e32e25ca339..2e5742546175 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "boto3" ]; + dependencies = [ boto3 orjson From 2a90c5effb2e1319cd82cdc929a862b623602a73 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 09:55:38 +0100 Subject: [PATCH 293/348] python313Packages.safety: relax filelock and psutil constraints --- pkgs/development/python-modules/safety/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index ffbbe1092b13..69de04c60202 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -52,7 +52,9 @@ buildPythonPackage rec { build-system = [ hatchling ]; pythonRelaxDeps = [ + "filelock" "pydantic" + "psutil" ]; dependencies = [ From 7b5fa9b18700c474b61620fa8705d0a99e24e644 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 09:56:15 +0100 Subject: [PATCH 294/348] python313Packages.findpython: 0.6.2 -> 0.6.3 https://github.com/frostming/findpython/releases/tag/0.6.3 --- pkgs/development/python-modules/findpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 16cb43c7d198..b755709b553a 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -16,7 +16,7 @@ let pname = "findpython"; - version = "0.6.2"; + version = "0.6.3"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-4MdbqfNaf5u0Qj6zG9FzWMzPFXYbaDcxdxkXeu/0ZyM="; + hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ="; }; nativeBuildInputs = [ pdm-backend ]; From 92d16faa4f1fc5ad03a667f14fb29910d0f0513a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 10:59:30 +0100 Subject: [PATCH 295/348] python312Packages.geometric: fix src hash --- pkgs/development/python-modules/geometric/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 696e4d19feec..f773239c6118 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "leeping"; repo = "geomeTRIC"; tag = version; - hash = "sha256-8kM6zaQPxtFiJGT8ZW0ivg7bJc/8sdfoTv7NGW2wwR8="; + hash = "sha256-hxNzyuupktUWDzZXXJNsVoC6m/kyE1fbfY5K6LiO+x0="; }; propagatedBuildInputs = [ From 3a99418a8699797ad7194fab8b6a1657d0fccc9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 21:46:31 +0100 Subject: [PATCH 296/348] python313Packages.glyphsets: relax setuptools-scm constraint --- pkgs/development/python-modules/glyphsets/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index 8643b21c0416..d2a33b40cb12 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-jza6VQ3PZAQPku2hyo0KeO59r64Q9TpqLCI0dIX/URU="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "setuptools_scm>=8.1.0,<8.2" setuptools_scm + ''; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; build-system = [ From f942c0b5319d7cacb6bbb8d03822fb2b6e12fabd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 22:03:48 +0100 Subject: [PATCH 297/348] python313Packages.asdf: 4.0.0 -> 4.1.0 https://github.com/asdf-format/asdf/compare/refs/tags/4.0.0...4.1.0 --- pkgs/development/python-modules/asdf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 382f7a5827c8..847b9eca0a38 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "asdf"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "asdf-format"; repo = "asdf"; tag = version; - hash = "sha256-4fR9hc6Ez6uwi/QwOQwRyRfpbHsmGsJEtWZIj4k+9FY="; + hash = "sha256-h7OkLq9+sW507Va22cF0eez6xrI7iIaLV5D7EZFWxJQ="; }; build-system = [ @@ -60,6 +60,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # AssertionError: assert 527033 >= 1048801 + "test_update_add_array_at_end" + ]; + pythonImportsCheck = [ "asdf" ]; meta = with lib; { From c08bfc2905d4aac129804f88f2a79245e11d8b69 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 22:32:51 +0100 Subject: [PATCH 298/348] python313Packages.spglib: 2.5.0 -> 2.6.0 https://github.com/spglib/spglib/raw/v2.6.0/ChangeLog --- pkgs/development/python-modules/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index bebf413b2b58..46ec8597a9ef 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-+LtjiJe+kbnb1MCF2f3h9pBI9ZSeIPODLLlDjldBjUs="; + hash = "sha256-1m7aK6AKHhT9luycO02/irD7PxJGQ+NXhcce5FW0COs="; }; nativeBuildInputs = [ From 097d86071677db1eed06831f5b9b694dfddea2e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 23:09:34 +0100 Subject: [PATCH 299/348] python313Packages.asyncua: disable failing test --- pkgs/development/python-modules/asyncua/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 3ba537f7ca8e..078be97adfb7 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -11,6 +11,7 @@ pytest-mock, pytestCheckHook, python-dateutil, + pythonAtLeast, pythonOlder, pytz, setuptools, @@ -66,6 +67,11 @@ buildPythonPackage rec { # Failed: DID NOT RAISE "test_publish" ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # dbm.sqlite3.error: SQLite objects created in a thread can only be used in that same thread. + # The object was created in thread id 140737220687552 and this is thread id 140737343690560. + "test_runTest" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... "test_anonymous_rejection" From fb98defc6161f5c6ce4a37ff5c9d742ca73bfa9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Mar 2025 17:15:00 -0800 Subject: [PATCH 300/348] python313Packages.jsonschema-path: 0.3.3 -> 0.3.4 Diff: https://github.com/p1c2u/jsonschema-path/compare/refs/tags/0.3.3...0.3.4 Changelog: https://github.com/p1c2u/jsonschema-path/releases/tag/0.3.4 --- .../python-modules/jsonschema-path/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix index feaf410959c9..074d8a997993 100644 --- a/pkgs/development/python-modules/jsonschema-path/default.nix +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -1,35 +1,28 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, pathable, pyyaml, referencing, + pytest-cov-stub, pytestCheckHook, responses, }: buildPythonPackage rec { pname = "jsonschema-path"; - version = "0.3.3"; - - disabled = pythonOlder "3.8"; - + version = "0.3.4"; pyproject = true; src = fetchFromGitHub { owner = "p1c2u"; repo = "jsonschema-path"; tag = version; - hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4="; + hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo="; }; - postPatch = '' - sed -i '/--cov/d' pyproject.toml - ''; - build-system = [ poetry-core ]; pythonRelaxDeps = [ "referencing" ]; @@ -43,6 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jsonschema_path" ]; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook responses ]; From 1d834df88d325bce6558fa0cb6442148badd077b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Mar 2025 00:03:22 +0100 Subject: [PATCH 301/348] python313Packages.beanhub-extract: relax pytz constraint It doesn't make sense to pin an old version of a timezone database... --- pkgs/development/python-modules/beanhub-extract/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix index 4a1857bfdd7e..bf21ebb68d4a 100644 --- a/pkgs/development/python-modules/beanhub-extract/default.nix +++ b/pkgs/development/python-modules/beanhub-extract/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "pytz" ]; + dependencies = [ iso8601 pytz From f3b5d54e49009a2e998690230e5b78b518b883ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Mar 2025 00:11:55 +0100 Subject: [PATCH 302/348] python313Packages.explorerscript: relax scikit-build-core constraint --- pkgs/development/python-modules/explorerscript/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 329e6baf2149..e612e1fe1d9b 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "scikit-build-core>=0.10.7, < 0.11" "scikit-build-core" + ''; + build-system = [ setuptools scikit-build-core From 81aae12c82a89a7c02d735b1486a5af530a21c33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Mar 2025 12:38:51 +0100 Subject: [PATCH 303/348] python313Packages.numpydoc: disable failing tests Likely a result of the last sphinx update. --- pkgs/development/python-modules/numpydoc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index a0420c27548d..1b3e649e3c9f 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -51,6 +51,9 @@ buildPythonPackage rec { "test_mangle_docstring_validation_exclude" "test_mangle_docstring_validation_warnings" "test_mangle_docstrings_overrides" + # AttributeError: 'MockBuilder' object has no attribute '_translator' + "test_mangle_docstrings_basic" + "test_mangle_docstrings_inherited_class_members" ]; pythonImportsCheck = [ "numpydoc" ]; From 2b21c29f9a5520c5989204374c43c25be90fecc7 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Mar 2025 17:44:21 +0300 Subject: [PATCH 304/348] gcc: remove .la files --- pkgs/development/compilers/gcc/common/builder.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 47b3ed1d3adc..4900af162adf 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -278,7 +278,6 @@ originalAttrs: targetLibDir="''${targetConfig+$targetConfig/}lib" moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}" - moveToOutput "$targetLibDir/lib*.la" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}" moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}" @@ -288,19 +287,18 @@ originalAttrs: moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}" fi - for i in "''${!outputLib}"/$targetLibDir/*.{la,py}; do + for i in "''${!outputLib}"/$targetLibDir/*.py; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done # Multilib and cross can't exist at the same time, so just use lib64 here if [ -n "$enableMultilib" ]; then moveToOutput "lib64/lib*.so*" "''${!outputLib}" - moveToOutput "lib64/lib*.la" "''${!outputLib}" moveToOutput "lib64/lib*.dylib" "''${!outputLib}" moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" moveToOutput "lib64/lib*.dll" "''${!outputLib}" - for i in "''${!outputLib}"/lib64/*.{la,py}; do + for i in "''${!outputLib}"/lib64/*.py; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" done fi @@ -313,6 +311,12 @@ originalAttrs: # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug + # Remove .la files, they're not adjusted for the makeCompatibilitySymlink magic, + # which confuses libtool and leads to weird linking errors. + # Removing the files just makes libtool link .so files directly, which is usually + # what we want anyway. + find $out -name '*.la' -delete + if type "install_name_tool"; then for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do install_name_tool -id "$i" "$i" || true From cfb15c65204bcee4539e2bc6dcde197aa57ad95a Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Mar 2025 21:07:43 +0300 Subject: [PATCH 305/348] Revert "glusterfs: also apply hack" This reverts commit 8503e5613fad9f08f5090212ead1357899d8a71f. --- pkgs/by-name/gl/glusterfs/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/gl/glusterfs/package.nix b/pkgs/by-name/gl/glusterfs/package.nix index 7122f77bf640..7c367cd2ad09 100644 --- a/pkgs/by-name/gl/glusterfs/package.nix +++ b/pkgs/by-name/gl/glusterfs/package.nix @@ -159,12 +159,6 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ autoconf automake From 4e29b6dcac8e197a0f7f3bc537b164f4949e144f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Mar 2025 21:07:55 +0300 Subject: [PATCH 306/348] Revert "treewide: apply hack to packages that fail after GCC symlink changes" This reverts commit aca1e446e2d348c7e88aaf0dcb750d0a0d45c286. --- pkgs/by-name/bo/bonmin/package.nix | 6 ------ pkgs/by-name/ec/eclib/package.nix | 7 ------- pkgs/by-name/gi/giac/package.nix | 6 ------ pkgs/desktops/mate/caja/default.nix | 6 ------ pkgs/development/libraries/gtk-sharp/3.0.nix | 6 ------ 5 files changed, 31 deletions(-) diff --git a/pkgs/by-name/bo/bonmin/package.nix b/pkgs/by-name/bo/bonmin/package.nix index a38f3a6b4de5..8104e34ad4bd 100644 --- a/pkgs/by-name/bo/bonmin/package.nix +++ b/pkgs/by-name/bo/bonmin/package.nix @@ -57,12 +57,6 @@ stdenv.mkDerivation rec { "--with-asl-lib=-lipoptamplinterface -lamplsolver" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - # Fix doc install. Should not be necessary after next release # ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28 sourceRoot = "${src.name}/Bonmin"; diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index 17765450dd38..8eb4a1f0bab0 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -41,13 +41,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - doCheck = true; meta = with lib; { description = "Elliptic curve tools"; diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index 0341f051d14a..cf218da403a0 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -106,12 +106,6 @@ stdenv.mkDerivation rec { substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"' ''; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ autoreconfHook texliveSmall diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 4b2026436f4b..b39f302274a3 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -46,12 +46,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update-mimedb" ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index fed79a27f8d8..89121db3b5d4 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -22,12 +22,6 @@ stdenv.mkDerivation rec { sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono From aa1f3eb6fa1c7000d80a5c33828d3eaf69fa3bbf Mon Sep 17 00:00:00 2001 From: Konrad Date: Tue, 11 Mar 2025 20:55:13 +0100 Subject: [PATCH 307/348] cc-wrapper: warn about cross-compile only with non-default (#379593) --- .../cc-wrapper/add-clang-cc-cflags-before.sh | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index 9abd07e99525..039263e9aaca 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -1,15 +1,35 @@ needsTarget=true +targetValue="" + +declare -i n=0 +nParams=${#params[@]} +while (("$n" < "$nParams")); do + p=${params[n]} + v=${params[n + 1]:-} # handle `p` being last one + n+=1 -for p in "${params[@]}"; do case "$p" in - -target | --target=*) + -target) + if [ -z "$v" ]; then + echo "Error: -target requires an argument" >&2 + exit 1 + fi needsTarget=false - - echo "Warning: supplying the --target argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 + targetValue=$v + # skip parsing the value of -target + n+=1 + ;; + --target=*) + needsTarget=false + targetValue="${p#*=}" ;; esac done +if ! $needsTarget && [[ "$targetValue" != "@defaultTarget@" ]]; then + echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 +fi + if $needsTarget && [[ $0 != *cpp ]]; then extraBefore+=(-target @defaultTarget@ @machineFlags@) fi From eaf7326729ea7debc9af2ce60f4c3e4863ac3c4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 11 Mar 2025 22:09:22 +0100 Subject: [PATCH 308/348] python313Packages.sqlalchemy: 2.0.38 -> 2.0.39 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_39 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index fff3fe067247..83823e97ce42 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.38"; + version = "2.0.39"; pyproject = true; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-If4PEBD67pm0fs1TZkJTKNuFPRfc6SxIEm94ymyDvow="; + hash = "sha256-AuzaBrVR58kuyXF87GEQRrSb/b8yZqjOeWMz3JagoqA="; }; postPatch = '' From 019bbf203afc6b20ae3422ea15186dfffabc6058 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 5 Mar 2025 22:36:30 +0100 Subject: [PATCH 309/348] gst_all_1.gst-plugins-bad: disable DirectFB DirectFB had no point release for 11 years now and is probably unused by the majority of users, yet it's a transitive dependency of many packages due to being used in gst-plugins-bad. This plugin has been disabled in Arch for 5 years now and it will be disabled in the next Debian release: so this change should be fairly safe. --- pkgs/development/libraries/gstreamer/bad/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 7e756b976b21..d573d2325fba 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -111,7 +111,7 @@ , microdnsSupport ? false # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc -, guiSupport ? true, directfb +, guiSupport ? true }: stdenv.mkDerivation rec { @@ -253,8 +253,6 @@ stdenv.mkDerivation rec { libGLU ] ++ lib.optionals guiSupport [ gtk3 - ] ++ lib.optionals (stdenv.hostPlatform.isLinux && guiSupport) [ - directfb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # For unknown reasons the order is important, e.g. if # VideoToolbox is last, we get: @@ -313,14 +311,13 @@ stdenv.mkDerivation rec { "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" (lib.mesonEnable "openh264" openh264Support) (lib.mesonEnable "doc" enableDocumentation) + (lib.mesonEnable "directfb" false) ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Dnvcodec=disabled" # Linux-only ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !gst-plugins-base.waylandEnabled) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` - ] ++ lib.optionals (!stdenv.hostPlatform.isLinux || !guiSupport) [ - "-Ddirectfb=disabled" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Daja=disabled" "-Dchromaprint=disabled" From 3ee5cb7266b4c188106d875804e63445b966662b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 12 Mar 2025 14:22:40 +0800 Subject: [PATCH 310/348] Reapply "emacs: enable __structuredAttrs by default in elisp build helpers" This reverts commit e9dab0cc20091a200b3d73309d7a9758fb284565. The fix[1] has been merged into staging, so we can enable __structuredAttrs again. [1]: https://github.com/NixOS/nixpkgs/pull/388908 --- nixos/doc/manual/release-notes/rl-2505.section.md | 3 +++ pkgs/applications/editors/emacs/build-support/generic.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 87bf2c1b1cca..50d812515435 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -208,6 +208,9 @@ - `pkgs.nextcloud28` has been removed since it's out of support upstream. +- Emacs lisp build helpers, such as `emacs.pkgs.melpaBuild`, now enables `__structuredAttrs` by default. + Environment variables have to be passed via the `env` attribute. + - `buildGoModule` now passes environment variables via the `env` attribute. `CGO_ENABLED` should now be specified with `env.CGO_ENABLED` when passing to buildGoModule. Direct specification of `CGO_ENABLED` is now redirected by a compatibility layer with a warning, but will become an error in future releases. Go-related environment variables previously shadowed by `buildGoModule` now results in errors when specified directly. Such variables include `GOOS` and `GOARCH`. diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index ddab4bc70a00..b4e96f6490fb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -61,6 +61,7 @@ lib.extendMkDerivation { propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; strictDeps = args.strictDeps or true; + __structuredAttrs = args.__structuredAttrs or true; inherit turnCompilationWarningToError ignoreCompilationError; From 53915255096ecfc60f8f6381c4eac603d92e01c9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 12 Mar 2025 23:23:28 +0800 Subject: [PATCH 311/348] Revert "mate.eom: Apply hack for GCC symlink changes" This reverts commit 165e81ebf7df4031627e9efd0a1343cf8dd1d91e. The proper fix is 2b21c29f9a5520c5989204374c43c25be90fecc7. --- pkgs/desktops/mate/eom/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 6f680692aa97..01566f483a6b 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -50,12 +50,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - postConfigure = '' - substituteInPlace libtool \ - --replace-warn 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; From 043321fc4c88eb14129671a54c37097503e88b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Wed, 12 Feb 2025 21:25:13 +0100 Subject: [PATCH 312/348] python3Packages.cairocffi: fix darwin sandbox build --- pkgs/development/python-modules/cairocffi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 0779eae1c92d..bbcdbfb5fff8 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -56,6 +56,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "cairocffi" ]; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + meta = with lib; { changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; From 9eefabc0dc9a4c68078a89b19f2de4427d56cdf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Wed, 12 Feb 2025 21:25:28 +0100 Subject: [PATCH 313/348] python3Packages.pycairo: fix darwin sandbox build --- pkgs/development/python-modules/pycairo/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index b1f0e5eba83e..883a879d3b1f 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + mesonFlags = [ # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix From 4922d9acc67a3780debd3ca4fb6ecd765d998492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Wed, 12 Feb 2025 21:25:43 +0100 Subject: [PATCH 314/348] python3Packages.pygal: fix darwin sandbox build --- pkgs/development/python-modules/pygal/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 52265c6ae970..2585c7dda9f5 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -56,6 +56,10 @@ buildPythonPackage rec { export LANG=en_US.UTF-8 ''; + # Cairo tries to load system fonts by default. + # It's surfaced as a Cairo "out of memory" error in tests. + __impureHostDeps = [ "/System/Library/Fonts" ]; + postCheck = '' export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} ''; From b79dce325d67b3f43e59b4b6b050762a6fed9710 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Thu, 13 Mar 2025 10:26:49 +0100 Subject: [PATCH 315/348] Revert "singular: fix build" This reverts commit c55e4e15d6aaf4d11b691ae2c1f059aa0d170a18. --- pkgs/by-name/si/singular/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index cddb360c5885..40fa34b87761 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -119,12 +119,6 @@ stdenv.mkDerivation rec { -i '{}' ';' ''; - # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 - preConfigure = '' - substituteInPlace build-aux/ltmain.sh \ - --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' - ''; - hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; doCheck = true; # very basic checks, does not test any libraries From 9bb374e093df8045b7c4b8f98eb6b1a78f46cef1 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Thu, 13 Mar 2025 14:18:28 +0100 Subject: [PATCH 316/348] ghostscript: 10.04.0 -> 10.05.0 Changelog: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/tag/gs10050 --- pkgs/by-name/gh/ghostscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index d54d17a64433..9e0990ba3aab 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -63,11 +63,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.04.0"; + version = "10.05.0"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha256-Un7vC2zQTs8cjXoReWxppS00/+Nq/KhqQAcpovwByIc="; + hash = "sha256-qsnE/fYYBadvYiABJzXBroMoE3iDFL/AQFXMDIlZuaM="; }; patches = [ From ca6e0c109f89158ae2298761f6f45a982b5d7511 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Mar 2025 15:28:13 +0000 Subject: [PATCH 317/348] pyright: 1.1.394 -> 1.1.396 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index fb5b99f841dd..3bfa13310d3f 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.394"; + version = "1.1.396"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-zOJtv9ETolo3XmH+ztNJEmX319rV/CABDIw2crSxqqw="; + hash = "sha256-6YvjpLV1Jj5N0CgN9hE7C2X9BMYZBJegB0xpSBW8n5c="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-RE1ZwMKgWu686/ejMB0E1CRix8MLv6lNoEkyAkvOC6U="; + npmDepsHash = "sha256-HwwVshop15nHE5oFuPIFmL5AduJ2z208cv2TbEAEMnY="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-sQeHXfhm6u0at4vhFjGPwMmTdDomU6cJnolOFO6ynXA="; + npmDepsHash = "sha256-ywQimf2w5xXbNqcluv6Bi/wH7/QQG0U/r6Ferx9vbis="; postPatch = '' chmod +w ../../ From 70044e898988a43bf60f26e98bee3c5db7c2befa Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 13 Mar 2025 17:51:18 +0100 Subject: [PATCH 318/348] chromaprint: add checks (#389190) --- pkgs/by-name/ch/chromaprint/package.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 457f6985a7e0..61b8766d6501 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch, fetchpatch2, + fetchurl, cmake, ninja, ffmpeg-headless, @@ -76,8 +77,29 @@ stdenv.mkDerivation (finalAttrs: { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; + doCheck = true; + checkPhase = + let + exampleAudio = fetchurl { + name = "Dvorak_Symphony_9_1.mp3"; + url = "https://archive.org/download/Dvorak_Symphony_9/01.Adagio-Allegro_Molto.mp3"; + hash = "sha256-I+Ve3/OpL+3Joc928F8M21LhCH2eQfRtaJVx9mNOLW0="; + meta.license = lib.licenses.publicDomain; + }; + + # sha256 because actual output of fpcalc is quite long + expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac"; + in + '' + runHook preCheck + tests/all_tests + ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"} + runHook postCheck + ''; + meta = { + changelog = "https://github.com/acoustid/chromaprint/releases/tag/v${finalAttrs.version}"; homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; license = lib.licenses.lgpl21Plus; From 7e98f7598d5f4a850e6a63e2963f3685a97b05e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 14:38:44 +0100 Subject: [PATCH 319/348] pipewire: 1.4.0 -> 1.4.1 https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.4.1 --- pkgs/development/libraries/pipewire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7693d9866569..175ddc10472b 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.4.0"; + version = "1.4.1"; outputs = [ "out" @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-xhlRwodW79mD6Vj+NLvcWxuK9+W+4M5DeZUaU36OiQE="; + sha256 = "sha256-TnGn6EVjjpEybslLEvBb66uqOiLg5ngpNV9LYO6TfvA="; }; patches = [ From 41d524832d07a30fd601e2d06c321ca83d96c914 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 15 Mar 2025 05:37:06 +0000 Subject: [PATCH 320/348] pipewire: fix cross compilation the build process for pipewire 1.4.0 involves compiling helper binaries for the build machine: --- pkgs/development/libraries/pipewire/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 175ddc10472b..fa39594d2589 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, + buildPackages, fetchFromGitLab, python3, meson, @@ -96,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ docutils doxygen From a5acaa0bfc98ed0f60467c84e55f9524fcc0661d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 15 Mar 2025 12:41:42 +0300 Subject: [PATCH 321/348] kdePackages: Frameworks 6.11 -> 6.12 --- pkgs/kde/generated/sources/frameworks.json | 432 ++++++++++----------- 1 file changed, 216 insertions(+), 216 deletions(-) diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index f7d897c97d65..6d69bb11ca55 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/attica-6.11.0.tar.xz", - "hash": "sha256-57fAPXZWpZcOAtYcP40nYLLD2kbT9kZL/CVKczsmP7M=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/attica-6.12.0.tar.xz", + "hash": "sha256-UnV/+x6gHjvrdCUy9n0cy96aVi46/9YhRDvxPZN864I=" }, "baloo": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/baloo-6.11.0.tar.xz", - "hash": "sha256-u4fUBTSgDMNj0p49fQ83qdzdDYMdsaV7v4uOOVUHVgo=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/baloo-6.12.0.tar.xz", + "hash": "sha256-iYRPq5x5LfWioZ6DJC5Pxx/8X9UeGOKz2QY3cdUJa14=" }, "bluez-qt": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/bluez-qt-6.11.0.tar.xz", - "hash": "sha256-k4ELpwp8rAQ7InsjrGqQfFL6L4qpDOtKz+jW1Gt+ros=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/bluez-qt-6.12.0.tar.xz", + "hash": "sha256-2KhM0zoTRTAUhzkcbcYl4ne1olRNc2Dl9u2gKjTMdVg=" }, "breeze-icons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/breeze-icons-6.11.0.tar.xz", - "hash": "sha256-+c2ewbakERRny6Mafu1Q7l8DhG+x9cMrOr2/aId/ik4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/breeze-icons-6.12.0.tar.xz", + "hash": "sha256-Gvl5pnwFOfJ6j8v/lzyRJFWEv7Jg3WTCBrxpFXXLtmg=" }, "extra-cmake-modules": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/extra-cmake-modules-6.11.0.tar.xz", - "hash": "sha256-af2rXw/t+3PRrM/1AS1RC0huHddccR6SWmkSo+cYFLA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/extra-cmake-modules-6.12.0.tar.xz", + "hash": "sha256-5U6HNl4ZPIBpZulpgyC96BmBIZV0ch/xlwqYFjyO1aA=" }, "frameworkintegration": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/frameworkintegration-6.11.0.tar.xz", - "hash": "sha256-p0R6WHBAKERjhGpHngG32CHIm187hoPLs2f1aM6oH7I=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/frameworkintegration-6.12.0.tar.xz", + "hash": "sha256-mw1qoaUUkzMd4S5I4JHbHVTu9BEgx88+qLpn3/jtPEE=" }, "kapidox": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kapidox-6.11.0.tar.xz", - "hash": "sha256-o/kGK+5XNMjkUG2AoVkbnRKJpwFx0Q9N6dqIdRbetLw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kapidox-6.12.0.tar.xz", + "hash": "sha256-N+BjcFYUHNw6c353PSyq4yN9ExQGvrAJYMEI6OYWBpg=" }, "karchive": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/karchive-6.11.0.tar.xz", - "hash": "sha256-EvxKxTWR+x3YHWxSQ7kAptSAZlWSY/xm6y9Jlc6544A=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/karchive-6.12.0.tar.xz", + "hash": "sha256-kKU5fV3zqQSGtNfvrqspgptjqHeyXiPln18S9DH4KQQ=" }, "kauth": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kauth-6.11.0.tar.xz", - "hash": "sha256-R5Zg6r6XGYwx8iihgnG8c5sjSUPGjpU4PDYag1ExF5s=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kauth-6.12.0.tar.xz", + "hash": "sha256-BM9PHC0ezet4z9mG4h1Iq1May+aUIPNDIH3Wbaj/nZM=" }, "kbookmarks": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kbookmarks-6.11.0.tar.xz", - "hash": "sha256-tcZ3RTxwMUue7MABGnMQPwReq8lLxfLyI7WXl4DIAcc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kbookmarks-6.12.0.tar.xz", + "hash": "sha256-G27cIKenl/4qGQ1aeKO20PRtHnsbLIFkbeMXa/dPjjo=" }, "kcalendarcore": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcalendarcore-6.11.0.tar.xz", - "hash": "sha256-6iYTJNG4DvR4a4bPhr+jLDMqoDV7BbopmxP1S+aac4A=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcalendarcore-6.12.0.tar.xz", + "hash": "sha256-+HD6Tjn5HgT55o8qPrD0lHmEYAW7DNQYA8khD16V4lE=" }, "kcmutils": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcmutils-6.11.0.tar.xz", - "hash": "sha256-ZNLFzYFlGJwtdBu1Q6q3K1vI21xUDKTojC+ND5PneZA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcmutils-6.12.0.tar.xz", + "hash": "sha256-eqzS8G8POTYx/AWBiLkq1Vkphx6Tqi6j3iqdCzWjasc=" }, "kcodecs": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcodecs-6.11.0.tar.xz", - "hash": "sha256-+93EN7qZadiWNbdfDvfkHJJcYcZNrB//AIwukTgTn+Q=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcodecs-6.12.0.tar.xz", + "hash": "sha256-blhSlUqeg3UONG+GA+gUYBDNyNfVRKXl1etG2TyUqRE=" }, "kcolorscheme": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcolorscheme-6.11.0.tar.xz", - "hash": "sha256-iye924MPAXP0SumqwFITV5kJuF+mlqKHGy7hHLI5vMg=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcolorscheme-6.12.0.tar.xz", + "hash": "sha256-9CJpmce5ydqN6e2eMXT8pJ94ZNoNodC8lmjERI9mdRI=" }, "kcompletion": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcompletion-6.11.0.tar.xz", - "hash": "sha256-yBK2DeRTDeMAORbkX7qxIcX59XbiQwqyzfDj5MkEGFI=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcompletion-6.12.0.tar.xz", + "hash": "sha256-jNMReVtdFcB7IbNsESTOTxqgoYo6A//ylgjkyt0JGpw=" }, "kconfig": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kconfig-6.11.0.tar.xz", - "hash": "sha256-xxByqvJ3EpW1kfxi1PtlfO+zjfKfJA75xxIIVLQtD38=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kconfig-6.12.0.tar.xz", + "hash": "sha256-A9HQkFTWRsZ/yqnx+lMVeBGtB+9Ao4ufTgtSrjFzsb8=" }, "kconfigwidgets": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kconfigwidgets-6.11.0.tar.xz", - "hash": "sha256-KKG7ElFh/pqw2/qJlDNRLpKGab4xzhSfolGRokpQJCo=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kconfigwidgets-6.12.0.tar.xz", + "hash": "sha256-ZtpiyQtrBuW+xo5pH3DJwwL+TcX9TeUANZV9p/Ro0mY=" }, "kcontacts": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcontacts-6.11.0.tar.xz", - "hash": "sha256-LwzSazK9utFLbl8+/5niOu3yQl6ssNTW9Eck3ObiZWI=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcontacts-6.12.0.tar.xz", + "hash": "sha256-TI4LdCAcSDiM7c/7djen9Gt1r+ao8IggappEGNQ/KoA=" }, "kcoreaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcoreaddons-6.11.0.tar.xz", - "hash": "sha256-/2kcbgkzST6j6MSgukH6Rs7XuTlObzXvne40nM/MOjk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcoreaddons-6.12.0.tar.xz", + "hash": "sha256-ezfo1OGFvN2L/RZsc59628sHMM3xQNZKMI97lrGEVzY=" }, "kcrash": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kcrash-6.11.0.tar.xz", - "hash": "sha256-uhPp9d0rQBJdXWHSm2EttjgzFdwPUQzB8OM7tsmwrok=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kcrash-6.12.0.tar.xz", + "hash": "sha256-wLlhENJfqjVYesSvMM0eOoASEz/KwSJ26LJZd82bhKQ=" }, "kdav": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdav-6.11.0.tar.xz", - "hash": "sha256-nKVYbmcvVkOYjc1gS2oDD1mz1eePHPNyXy5PJXhSNA4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdav-6.12.0.tar.xz", + "hash": "sha256-sHPWBCvxRIAcFrPBnhuKKoGDuJOTl6w86qQ9IGhDML4=" }, "kdbusaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdbusaddons-6.11.0.tar.xz", - "hash": "sha256-YuDzsEh+8atyn8hby1SYyUSeC3T+gEl3lDQVi7ixKoc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdbusaddons-6.12.0.tar.xz", + "hash": "sha256-wjbHCSK5ZAp9/jrIELDXQ1Vd9K65RTZ15WpEnuwexSE=" }, "kdeclarative": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdeclarative-6.11.0.tar.xz", - "hash": "sha256-augRNnvLyBkPil0u85qObHKHHEHsJuKksMODJKPoWWs=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdeclarative-6.12.0.tar.xz", + "hash": "sha256-thIfcgM7Nh9AjecSX2H0DPFOnGxU6rlcRtquAoEuc7A=" }, "kded": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kded-6.11.0.tar.xz", - "hash": "sha256-VcmSERQpmr2b3F5gHMxqdQ/y0zH8CDbXlnDMvFCOBqQ=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kded-6.12.0.tar.xz", + "hash": "sha256-YBrJZL2EFFbRyu/pWwSj3wVcqFg9dTNTpVtHpt+2g+g=" }, "kdesu": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdesu-6.11.0.tar.xz", - "hash": "sha256-qstJ0xPnnxBnlcTat96Zkeb+TnJMK0wZ3u/NFx9qO6c=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdesu-6.12.0.tar.xz", + "hash": "sha256-wZ2Nz0x0rXTilAOj79FmIIZF7c7xQpdf+t87Icwi508=" }, "kdnssd": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdnssd-6.11.0.tar.xz", - "hash": "sha256-ads1S7Km+qwW7B63fm9xMI+OvZIFlnx121usk355m9k=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdnssd-6.12.0.tar.xz", + "hash": "sha256-q7RTjqVsff6e2gYzii3TuA9HMmODpsWiPyoJrV+svpg=" }, "kdoctools": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kdoctools-6.11.0.tar.xz", - "hash": "sha256-383GoCWPXMLlXSSPYWzHxiJOGwYUDetofkAbU3lZ/Ag=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kdoctools-6.12.0.tar.xz", + "hash": "sha256-DHLfRaYkeMKvELglXswYunnkEI/0spChNoHjU89cfhc=" }, "kfilemetadata": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kfilemetadata-6.11.0.tar.xz", - "hash": "sha256-+RkJaer2b50naQzDuFo9GTle42V1gsmubJTEmhEzEsc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kfilemetadata-6.12.0.tar.xz", + "hash": "sha256-X7OaNwUVQxfu/3i366d2tRpEY0oSFrYOvn9i7METGPc=" }, "kglobalaccel": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kglobalaccel-6.11.0.tar.xz", - "hash": "sha256-BVLk5cWKJEczr0nP3QyPwEpjgotsI0azaCAiLV47zvU=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kglobalaccel-6.12.0.tar.xz", + "hash": "sha256-HF5+TZtoYus2ofbCP9n/9LS88LT610C65cpY4VyEB/Q=" }, "kguiaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kguiaddons-6.11.0.tar.xz", - "hash": "sha256-7wkl9gmuW2LtaJRR3+mTdxnOTsJnFJUrVJbj4SjVzFw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kguiaddons-6.12.0.tar.xz", + "hash": "sha256-45SCbK3hxdlJEWbzo/TQw9YlvycQY1JnigbS7FNkxTI=" }, "kholidays": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kholidays-6.11.0.tar.xz", - "hash": "sha256-zNv6ter8BDV0kA1m4AIjJvYEjn3NsJvFON7eqZiJxq8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kholidays-6.12.0.tar.xz", + "hash": "sha256-aYx3RO0ExdOVlgtPTIwHz196KBy5zsaL8w/beEFVA8M=" }, "ki18n": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ki18n-6.11.0.tar.xz", - "hash": "sha256-ZYoFzsoYS6Mc5YpunFHudvKClFnFbbzTutOqFX6vEf4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ki18n-6.12.0.tar.xz", + "hash": "sha256-zRrbzeG637esiUXDwKmvwCsu1kLHaddOG8twoC0HDcU=" }, "kiconthemes": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kiconthemes-6.11.0.tar.xz", - "hash": "sha256-FnGrP9mx4HU6cGK6uA9UifOsdQ7LMLkduZpmiZiK+4c=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kiconthemes-6.12.0.tar.xz", + "hash": "sha256-VLG18oORYtmAhzMocWswzwj5D9B5rYVMwJh4rZs3bs8=" }, "kidletime": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kidletime-6.11.0.tar.xz", - "hash": "sha256-lu+wtTOjfdsuGIjf99RyLBnEfWYPdNGwpCLrlXGPSII=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kidletime-6.12.0.tar.xz", + "hash": "sha256-2KiIqMgDMU66l63yDkj51ZYExIC7A0KLfugycBAPpsM=" }, "kimageformats": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kimageformats-6.11.0.tar.xz", - "hash": "sha256-DEV4f5fQD8Alf33jJQ2E6VDeKjMsRedSgTj3z4QxVMw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kimageformats-6.12.0.tar.xz", + "hash": "sha256-ye/zCJlTC2GT7nhVtFLwc7C2tvkyVRYZXAhDlc3O2jY=" }, "kio": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kio-6.11.0.tar.xz", - "hash": "sha256-/lEeQ6U4b5Y8mv75OiHA30Siwk/MQXd35NBWkQJHf/g=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kio-6.12.0.tar.xz", + "hash": "sha256-FYHk+IV1DwijE0+tR7gelTVW4/yUAok5tH/64KtDLu4=" }, "kirigami": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kirigami-6.11.0.tar.xz", - "hash": "sha256-IjkslbuDXxFiYlDwcoznNZDbY4gU5xgRSPz2ah9ELqY=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kirigami-6.12.0.tar.xz", + "hash": "sha256-0Xfq4YqtNub0HTBxBORaj8xo2xR9uzM/bdsXiihGTnw=" }, "kitemmodels": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kitemmodels-6.11.0.tar.xz", - "hash": "sha256-OY3E48XERGE1CiCsI0BVuvwrGEKE3eqRVjE072L11qY=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kitemmodels-6.12.0.tar.xz", + "hash": "sha256-YmiDEQgrasoiYReBC8OZGwy5UVjexNTIANcKmb3P38g=" }, "kitemviews": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kitemviews-6.11.0.tar.xz", - "hash": "sha256-42JTaOP4z2EnIYzD6Ef78BdqWXjIYiixGjIK2W/qLLw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kitemviews-6.12.0.tar.xz", + "hash": "sha256-+NX/Lk5SNLzo7VaInYs9fpRVTsi0Djl9LprC/8EX49M=" }, "kjobwidgets": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kjobwidgets-6.11.0.tar.xz", - "hash": "sha256-K7NC5VT47PhNchimVnYo3Mc8G5FNDFqtHIv3dTmG3dc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kjobwidgets-6.12.0.tar.xz", + "hash": "sha256-7D4xSYwUCylvXkQuJSCCNDfybLYtcYbxFhN9GbvLnxI=" }, "knewstuff": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/knewstuff-6.11.0.tar.xz", - "hash": "sha256-izgCtrZDCatnCa81DySNxi4+bVCw207LDJaKz7+yNSA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/knewstuff-6.12.0.tar.xz", + "hash": "sha256-8LzKZsJn26M1499esImuQMVmgKfThRdrxE2VHe+j0Ck=" }, "knotifications": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/knotifications-6.11.0.tar.xz", - "hash": "sha256-ouCBXqblwpT902MWypeSpAb1wSPsAaHHOn5Uywvi6jE=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/knotifications-6.12.0.tar.xz", + "hash": "sha256-0oJUc7zE93QjtSZqW5LoGKmpix1nKxwp2PI33RHpkCY=" }, "knotifyconfig": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/knotifyconfig-6.11.0.tar.xz", - "hash": "sha256-YSURFhdYFEqdPZnU8KnrdZMcP4r1lm4EWgiAI8odDG8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/knotifyconfig-6.12.0.tar.xz", + "hash": "sha256-U0SPmB0WVuQjNSoBcj3iq5k+W7o5pz9t5CLrTestqqs=" }, "kpackage": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kpackage-6.11.0.tar.xz", - "hash": "sha256-v8cE6hcI83FQqdFO3Lue7Y6/jVR1OTDaY0Ms2pVKHqc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kpackage-6.12.0.tar.xz", + "hash": "sha256-qNZQX6alO/3MMfqPKtCpIm7J+vq8DAEgSQ++trAX+0o=" }, "kparts": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kparts-6.11.0.tar.xz", - "hash": "sha256-OZXzVWq6Q03nsT2uCZtRoKhq6t5guh4GWSg21AZpu2o=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kparts-6.12.0.tar.xz", + "hash": "sha256-uJeqMkED75dM5ROVVHP+Zf6uq6Td+Z+0zIZ3IRT6kww=" }, "kpeople": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kpeople-6.11.0.tar.xz", - "hash": "sha256-P2evQ0QjWOe02aCoHYYTNwf/quD14FxIqh85DsR/+Ws=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kpeople-6.12.0.tar.xz", + "hash": "sha256-pD3d54MlDX+1nT3814DPJ6t+QCj2snwDVR/Rei0xV+Y=" }, "kplotting": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kplotting-6.11.0.tar.xz", - "hash": "sha256-zrkVzAJs0g/xDo/bPkkU6mH3Noai2f5qiDml6tFKmJI=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kplotting-6.12.0.tar.xz", + "hash": "sha256-RidBrgpxcNRT1KqT2BP/nQ7XDL42OIhVY3rpWxsRy/4=" }, "kpty": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kpty-6.11.0.tar.xz", - "hash": "sha256-8dmFvwoUBhp2THwBvLbPKEpZrYLeE+cs/RvSaIGe68I=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kpty-6.12.0.tar.xz", + "hash": "sha256-hOcTzPYwyRo1HMrj2Vw7hXtn5Eb8SRpioBPcEBlPgDo=" }, "kquickcharts": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kquickcharts-6.11.0.tar.xz", - "hash": "sha256-/8Naew3eUqza5QiSWlVbdgBsydS3jrAD6aMc1DnymT8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kquickcharts-6.12.0.tar.xz", + "hash": "sha256-4zE7TcXiYBQloQPW9wzmHeoDQP6qBdH9mb9EU70d43o=" }, "krunner": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/krunner-6.11.0.tar.xz", - "hash": "sha256-IXnaZWN12IOep8LFAgh7UnxnFeEBhYKsj2NhLKUnqpA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/krunner-6.12.0.tar.xz", + "hash": "sha256-zgzjKC/J0fgRp7TEz7AV57n82NbKytlF6KOHV3E71Rs=" }, "kservice": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kservice-6.11.0.tar.xz", - "hash": "sha256-FhzSlld/+YArCIsGhm7Fq0wcGm/hn3a7UTTN+KarQAU=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kservice-6.12.0.tar.xz", + "hash": "sha256-lTO5OpUE3fLx6OaWvPraDDeRAZ7o6M++4E2dHRS2uWQ=" }, "kstatusnotifieritem": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kstatusnotifieritem-6.11.0.tar.xz", - "hash": "sha256-JsksJbH3Apa96ecfuh9xl3jIXLVyJ/YEX2Bq+ZxIqL0=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kstatusnotifieritem-6.12.0.tar.xz", + "hash": "sha256-Ww57IEktvZ1XQruv1vhXfcaCSAphXhll88U3QeaE/D0=" }, "ksvg": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ksvg-6.11.0.tar.xz", - "hash": "sha256-BTCS42t23u/+GWKa4So3KxcvlHvuPMIDTGjnuk4dps8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ksvg-6.12.0.tar.xz", + "hash": "sha256-dAfNrJ8f43cK2oig4UuKx9+sbfE3FFAeHXGz0PBFanc=" }, "ktexteditor": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ktexteditor-6.11.0.tar.xz", - "hash": "sha256-gtM9zK2Y4vUU3k0XxOZlGX/dhYilWXk1j4iu6sb8RBk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ktexteditor-6.12.0.tar.xz", + "hash": "sha256-1dIepl+chKm9o/utPY33DHaSTZ1WGCIGnuuc6GKSSj8=" }, "ktexttemplate": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ktexttemplate-6.11.0.tar.xz", - "hash": "sha256-sPMMbkmhMs31hyKOC6Hh2XTMFV0jO1f/YX9dVef3uQU=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ktexttemplate-6.12.0.tar.xz", + "hash": "sha256-n//X9skwmy/KOXz+29tV3tM+So5UOODc6/M7b5UAaZw=" }, "ktextwidgets": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/ktextwidgets-6.11.0.tar.xz", - "hash": "sha256-DwQ7imBpjM24jj1pV7X1yXz+eT6i7qQh/EZ//98gBpc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/ktextwidgets-6.12.0.tar.xz", + "hash": "sha256-aY4r5/xv0ntKpMGSoasLCrwIEhY5d1xP9PS0yB2PBB0=" }, "kunitconversion": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kunitconversion-6.11.0.tar.xz", - "hash": "sha256-jSaoPRNxvXDEgoFwhoDGnmH6ykSWPeq1LQfJcjwn7kk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kunitconversion-6.12.0.tar.xz", + "hash": "sha256-4pikWf+YHcgFKSBmBPpZkcJrzxnSiRdxaMOdubvA4II=" }, "kuserfeedback": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kuserfeedback-6.11.0.tar.xz", - "hash": "sha256-rFFre4+c0IkWZPi1gNClpcSUz2tdv93Ye29iVlSLeRA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kuserfeedback-6.12.0.tar.xz", + "hash": "sha256-b0VTezJ02Zw9Ubtc407++bVqZqhgkApjigbmZIsTMCw=" }, "kwallet": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kwallet-6.11.0.tar.xz", - "hash": "sha256-zpSwMkRu0eE4PmcxhbWkNy3uq3Hfi3pJCDobbq2CLgk=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kwallet-6.12.0.tar.xz", + "hash": "sha256-0j5/29pmZJBGK7v9UIeSTtRRtw3P9vpMmtNU257VrQA=" }, "kwidgetsaddons": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kwidgetsaddons-6.11.0.tar.xz", - "hash": "sha256-HGTnNUgEhF2wzYOuZx37XSywgwhVGgtse4ozmqbctDY=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kwidgetsaddons-6.12.0.tar.xz", + "hash": "sha256-As5grIui5xcYBxX3+3CwJNMMQ2+C+rbOGlRGlqnwwc0=" }, "kwindowsystem": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kwindowsystem-6.11.0.tar.xz", - "hash": "sha256-2HLoXQkV3Vzx4rr4n772LphV/zMX7MWTmIK8FyRijVo=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kwindowsystem-6.12.0.tar.xz", + "hash": "sha256-bn8Oob1bGw+B94X/D93rlDIiOC8cEbUgH2m2xidjtvY=" }, "kxmlgui": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/kxmlgui-6.11.0.tar.xz", - "hash": "sha256-acOmpjY72+PMus524jxszsFz6w+cGVTvcxfZmNbttvw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/kxmlgui-6.12.0.tar.xz", + "hash": "sha256-PDCkTj1Rdt42r1a2wp2GQT/VjGOGZ5xiIqpNC0bQ2Iw=" }, "modemmanager-qt": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/modemmanager-qt-6.11.0.tar.xz", - "hash": "sha256-pjYyOQLFepq/GZFo6cM7NDLFOOJ2JR5rt851P//vX+4=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/modemmanager-qt-6.12.0.tar.xz", + "hash": "sha256-HuUSPviznfy9zwTTEvAjS4Z2vNwO+sI8RiPAqJYvTto=" }, "networkmanager-qt": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/networkmanager-qt-6.11.0.tar.xz", - "hash": "sha256-5uFyMk5Ml4WRKZ4pga1q445dHj1422rIN1FgSvICtgw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/networkmanager-qt-6.12.0.tar.xz", + "hash": "sha256-s7Asg2PqptULmHgOiSLDWgck0lT1sVYYe9oyD/gHqc0=" }, "prison": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/prison-6.11.0.tar.xz", - "hash": "sha256-fMjf8+8XKyTRDuUMCHbXnIdzC2+yO9Z4cI93cLnaTyA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/prison-6.12.0.tar.xz", + "hash": "sha256-AABM15tQ2zxDl/apKKvrnB3MNI3NQ3sVjFfa2uhshoE=" }, "purpose": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/purpose-6.11.0.tar.xz", - "hash": "sha256-SOFy8Fhp4aLMGeDrYjCuEs/iPSNLQNbTuy9BHH9phOA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/purpose-6.12.0.tar.xz", + "hash": "sha256-r46HaFgvNXwI86F3Z0f0xKLFqMx9pVoK9WfOX1OtBg0=" }, "qqc2-desktop-style": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/qqc2-desktop-style-6.11.0.tar.xz", - "hash": "sha256-mWVCcWGWv6yKIoo2tGGMmS4ZN4J3nc9BONY444MGZSw=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/qqc2-desktop-style-6.12.0.tar.xz", + "hash": "sha256-j7jay+aPaPly3bHM7vFbnXDX5R7yBKbyX4MpgQyoliQ=" }, "solid": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/solid-6.11.0.tar.xz", - "hash": "sha256-zezHZluAGlCLmtCSmwJayT/ih75QNYnI2MOKUgwlCNc=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/solid-6.12.0.tar.xz", + "hash": "sha256-S9lrOUcjvlM6MEBIBL5Avkld+uBaRDDAESI9YD19hmY=" }, "sonnet": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/sonnet-6.11.0.tar.xz", - "hash": "sha256-GUQd5i2dl/YeSNJuADVD51YHsrqPbk/rGflWKJryHWA=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/sonnet-6.12.0.tar.xz", + "hash": "sha256-vuzKUsuVoEp6BDeAKWWVBesXoL1N/wkV1+XhyKO3XNI=" }, "syndication": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/syndication-6.11.0.tar.xz", - "hash": "sha256-2InFU6UYkzkhfo0GtihZWro8hCt0aT56gXlgaxNinh0=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/syndication-6.12.0.tar.xz", + "hash": "sha256-vH0CgitnBfkxLsoR8vHE3aTuE3+JgYV1TpoXHkKORyA=" }, "syntax-highlighting": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/syntax-highlighting-6.11.0.tar.xz", - "hash": "sha256-sj274ZUDCiknyq/F/fTKejcsRMqVAT1hFQN/5i4fy1E=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/syntax-highlighting-6.12.0.tar.xz", + "hash": "sha256-VkSvkAvqQNTaWo+eH7VzACMGrp4oSkOuU0LRphgQ5Is=" }, "threadweaver": { - "version": "6.11.0", - "url": "mirror://kde/stable/frameworks/6.11/threadweaver-6.11.0.tar.xz", - "hash": "sha256-xAjZ7zwT6ZBubvGhYt71v3RZ8JkZexeI6z2W30UF3Y8=" + "version": "6.12.0", + "url": "mirror://kde/stable/frameworks/6.12/threadweaver-6.12.0.tar.xz", + "hash": "sha256-7Hf7r7vZpr7wSOV+C9ZJmbHBezG0PVmjxamBqxjy4b4=" } } \ No newline at end of file From 5ef2dafe64595a1e85cd4c0bb64e716b1035c6b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 15 Mar 2025 12:42:54 +0300 Subject: [PATCH 322/348] kdePackages: update metadata --- pkgs/kde/gear/blinken/default.nix | 6 +- pkgs/kde/gear/klettres/default.nix | 6 +- pkgs/kde/gear/kmailtransport/default.nix | 7 +- pkgs/kde/gear/libgravatar/default.nix | 4 +- pkgs/kde/gear/mailcommon/default.nix | 2 + pkgs/kde/gear/tokodon/default.nix | 5 +- pkgs/kde/generated/dependencies.json | 275 +++++++++++++++------ pkgs/kde/generated/projects.json | 76 +++++- pkgs/kde/plasma/krdp/default.nix | 2 - pkgs/kde/plasma/plasma-desktop/default.nix | 3 - pkgs/kde/plasma/plasma5support/default.nix | 11 +- 11 files changed, 292 insertions(+), 105 deletions(-) diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix index 92cb126b089d..5027eeada8ca 100644 --- a/pkgs/kde/gear/blinken/default.nix +++ b/pkgs/kde/gear/blinken/default.nix @@ -1,10 +1,14 @@ { mkKdeDerivation, qtsvg, + phonon, }: mkKdeDerivation { pname = "blinken"; - extraBuildInputs = [ qtsvg ]; + extraBuildInputs = [ + qtsvg + phonon + ]; meta.mainProgram = "blinken"; } diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix index b01e22878385..9cced73f2fb9 100644 --- a/pkgs/kde/gear/klettres/default.nix +++ b/pkgs/kde/gear/klettres/default.nix @@ -1,10 +1,14 @@ { mkKdeDerivation, qtsvg, + phonon, }: mkKdeDerivation { pname = "klettres"; - extraBuildInputs = [ qtsvg ]; + extraBuildInputs = [ + qtsvg + phonon + ]; meta.mainProgram = "klettres"; } diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix index b021413b9328..7953ec021b64 100644 --- a/pkgs/kde/gear/kmailtransport/default.nix +++ b/pkgs/kde/gear/kmailtransport/default.nix @@ -1,9 +1,4 @@ -{ - mkKdeDerivation, - kconfigwidgets, -}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmailtransport"; - - extraBuildInputs = [ kconfigwidgets ]; } diff --git a/pkgs/kde/gear/libgravatar/default.nix b/pkgs/kde/gear/libgravatar/default.nix index fe2fddb9f018..5666dea42041 100644 --- a/pkgs/kde/gear/libgravatar/default.nix +++ b/pkgs/kde/gear/libgravatar/default.nix @@ -1,4 +1,6 @@ -{ mkKdeDerivation }: +{ mkKdeDerivation, pimcommon }: mkKdeDerivation { pname = "libgravatar"; + + extraBuildInputs = [ pimcommon ]; } diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix index 51a702ac9d9b..ecfef67b544e 100644 --- a/pkgs/kde/gear/mailcommon/default.nix +++ b/pkgs/kde/gear/mailcommon/default.nix @@ -3,6 +3,7 @@ qtwebengine, qttools, libxslt, + phonon, }: mkKdeDerivation { pname = "mailcommon"; @@ -11,5 +12,6 @@ mkKdeDerivation { extraBuildInputs = [ qtwebengine qttools + phonon ]; } diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index 47411b5e37c2..467ebc2837e6 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/pkgs/kde/gear/tokodon/default.nix @@ -5,7 +5,6 @@ qtsvg, qtwebsockets, qtwebview, - mpv-unwrapped, sonnet, }: mkKdeDerivation { @@ -17,8 +16,10 @@ mkKdeDerivation { qtsvg qtwebsockets qtwebview - mpv-unwrapped sonnet ]; + + extraCmakeFlags = [ "-DUSE_QTMULTIMEDIA=1" ]; + meta.mainProgram = "tokodon"; } diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index 52e01405accd..5fa3cd9a6b26 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/pkgs/kde/generated/dependencies.json @@ -73,11 +73,6 @@ "kio", "kmime" ], - "akonadi-notes": [ - "akonadi", - "extra-cmake-modules", - "kmime" - ], "akonadi-search": [ "akonadi", "akonadi-mime", @@ -215,6 +210,7 @@ "extra-cmake-modules", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "kfilemetadata", "ki18n", @@ -322,6 +318,18 @@ "plasma-workspace", "solid" ], + "aurorae": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdecoration", + "ki18n", + "knewstuff", + "kpackage", + "ksvg", + "kwindowsystem" + ], "baloo": [ "extra-cmake-modules", "kconfig", @@ -375,8 +383,7 @@ "kdoctools", "kguiaddons", "ki18n", - "kxmlgui", - "phonon" + "kxmlgui" ], "bluedevil": [ "bluez-qt", @@ -413,6 +420,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -424,6 +432,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -737,6 +746,7 @@ ], "elisa": [ "extra-cmake-modules", + "kcodecs", "kcolorscheme", "kconfig", "kconfigwidgets", @@ -871,6 +881,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1020,7 +1031,6 @@ "kunitconversion", "kwindowsystem", "libquotient", - "networkmanager-qt", "plasma-integration", "prison", "qqc2-breeze-style", @@ -1132,10 +1142,12 @@ "kaidan": [ "extra-cmake-modules", "kcoreaddons", + "kcrash", "kio", "kirigami", "kirigami-addons", - "kquickimageeditor" + "kquickimageeditor", + "prison" ], "kajongg": [ "extra-cmake-modules", @@ -1280,6 +1292,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1287,25 +1300,41 @@ "kapptemplate": [ "extra-cmake-modules", "karchive", + "kconfig", + "kconfigwidgets", "kcoreaddons", "kdoctools", "ki18n", - "kio", + "kiconthemes", "kirigami", "kirigami-addons" ], "karchive": [ "extra-cmake-modules" ], + "karp": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kirigami", + "kirigami-addons" + ], "kasts": [ "extra-cmake-modules", "kcolorscheme", "kconfig", "kcoreaddons", "kcrash", + "kdbusaddons", "ki18n", + "kiconthemes", "kirigami", "kirigami-addons", + "kwindowsystem", "qqc2-desktop-style", "qtkeychain", "syndication", @@ -1323,8 +1352,7 @@ "knewstuff", "ktexteditor", "kuserfeedback", - "qtkeychain", - "selenium-webdriver-at-spi" + "qtkeychain" ], "katomic": [ "extra-cmake-modules", @@ -1334,6 +1362,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "knewstuff", "kwidgetsaddons", "kxmlgui", @@ -1383,6 +1412,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "ktextwidgets", "kwidgetsaddons", "kxmlgui", @@ -1397,6 +1427,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1418,6 +1449,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kwidgetsaddons", "kxmlgui", @@ -1432,6 +1464,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -1576,10 +1609,8 @@ "kcmutils", "kconfigwidgets", "kcoreaddons", - "kdeclarative", "kdoctools", "ki18n", - "kio", "kirigami-addons" ], "kdav": [ @@ -1599,24 +1630,18 @@ ], "kde-cli-tools": [ "extra-cmake-modules", - "kauth", "kcmutils", - "kcodecs", "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", "kdesu", "ki18n", "kiconthemes", "kio", - "kjobwidgets", "kparts", - "kpty", "kservice", "kwidgetsaddons", - "kwindowsystem", - "solid" + "kwindowsystem" ], "kde-dev-scripts": [ "extra-cmake-modules", @@ -1676,8 +1701,7 @@ "kiconthemes", "kitemviews", "kwidgetsaddons", - "kxmlgui", - "selenium-webdriver-at-spi" + "kxmlgui" ], "kdeclarative": [ "extra-cmake-modules", @@ -1789,6 +1813,7 @@ "kaddressbook", "kcalendarcore", "kcalutils", + "kcmutils", "kcolorscheme", "kconfig", "kconfigwidgets", @@ -2073,6 +2098,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "knotifications", "knotifyconfig", "kwidgetsaddons", @@ -2151,8 +2177,7 @@ "ktexteditor", "ktextwidgets", "kwidgetsaddons", - "kxmlgui", - "marble" + "kxmlgui" ], "keysmith": [ "extra-cmake-modules", @@ -2164,6 +2189,7 @@ "kirigami", "kwidgetsaddons", "kwindowsystem", + "prison", "qqc2-desktop-style" ], "kfilemetadata": [ @@ -2207,6 +2233,7 @@ "kdnssd", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -2290,6 +2317,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kwidgetsaddons", "kxmlgui", @@ -2335,7 +2363,6 @@ "extra-cmake-modules", "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", "kcrash", "kdoctools", @@ -2437,6 +2464,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "knewstuff", "ktextwidgets", @@ -2471,6 +2499,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -2628,7 +2657,6 @@ "kirigami-gallery": [ "extra-cmake-modules", "kirigami", - "kirigami-addons", "kitemmodels" ], "kiriki": [ @@ -2699,6 +2727,7 @@ "kjournald": [ "extra-cmake-modules", "kcoreaddons", + "kcrash", "ki18n" ], "kjumpingcube": [ @@ -2710,6 +2739,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kjobwidgets", "kwidgetsaddons", @@ -2755,8 +2785,7 @@ "ki18n", "knewstuff", "kwidgetsaddons", - "kxmlgui", - "phonon" + "kxmlgui" ], "klevernotes": [ "extra-cmake-modules", @@ -2778,6 +2807,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kwidgetsaddons", "kxmlgui", @@ -2799,12 +2829,14 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" ], "kmag": [ "extra-cmake-modules", + "kcrash", "kdoctools", "ki18n", "kio", @@ -2887,6 +2919,7 @@ ], "kmailtransport": [ "extra-cmake-modules", + "kconfigwidgets", "ksmtp", "libkgapi", "qtkeychain" @@ -2922,6 +2955,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "ktextwidgets", "kwidgetsaddons", "kxmlgui", @@ -2944,13 +2978,6 @@ "kxmlgui", "solid" ], - "kmoretools": [ - "extra-cmake-modules", - "ki18n", - "kio", - "kjobwidgets", - "kwidgetsaddons" - ], "kmousetool": [ "extra-cmake-modules", "kconfig", @@ -3048,6 +3075,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "ktextwidgets", "kwidgetsaddons", "kxmlgui", @@ -3099,14 +3127,17 @@ "extra-cmake-modules", "kconfigwidgets", "kcoreaddons", + "kcrash", "ki18n", "kio", "kwidgetsaddons", + "kxmlgui", "purpose" ], "koko": [ "extra-cmake-modules", "kconfig", + "kconfigwidgets", "kcoreaddons", "kdbusaddons", "kdeclarative", @@ -3130,6 +3161,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "ktextwidgets", "kwidgetsaddons", @@ -3144,6 +3176,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -3310,6 +3343,13 @@ "kwidgetsaddons", "kwindowsystem" ], + "konvex": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kirigami", + "kwindowsystem" + ], "kooka": [ "extra-cmake-modules", "kconfig", @@ -3404,13 +3444,6 @@ "kitemviews", "kwidgetsaddons" ], - "kpeoplevcard": [ - "extra-cmake-modules", - "kcontacts", - "kcoreaddons", - "ki18n", - "kpeople" - ], "kphotoalbum": [ "karchive", "kcompletion", @@ -3424,6 +3457,7 @@ "kwidgetsaddons", "kxmlgui", "libkdcraw", + "marble", "phonon", "purpose" ], @@ -3474,6 +3508,18 @@ "kcoreaddons", "ki18n" ], + "kpublicalerts": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kguiaddons", + "ki18n", + "kirigami", + "knotifications", + "kunifiedpush", + "kweathercore" + ], "kpublictransport": [ "extra-cmake-modules", "ki18n", @@ -3514,7 +3560,8 @@ "kcrash", "kdbusaddons", "kpipewire", - "kstatusnotifieritem" + "kstatusnotifieritem", + "qtkeychain" ], "krecorder": [ "extra-cmake-modules", @@ -3568,6 +3615,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kjobwidgets", "kwidgetsaddons", @@ -3712,6 +3760,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kxmlgui", "libkdegames", "libkmahjongg" @@ -3750,6 +3799,7 @@ "kdoctools", "kguiaddons", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -3970,7 +4020,6 @@ "kxmlgui", "libktorrent", "phonon", - "solid", "syndication" ], "ktouch": [ @@ -4197,6 +4246,42 @@ "wayland", "wayland-protocols" ], + "kwin-x11": [ + "breeze", + "breeze-icons", + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdeclarative", + "kdecoration", + "kdoctools", + "kglobalaccel", + "kglobalacceld", + "ki18n", + "kidletime", + "kirigami", + "knewstuff", + "knotifications", + "kpackage", + "kpipewire", + "kscreenlocker", + "kservice", + "ksvg", + "kwayland", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "libqaccessibilityclient", + "plasma-activities", + "plasma-wayland-protocols", + "plasma-workspace", + "wayland", + "wayland-protocols" + ], "kwindowsystem": [ "extra-cmake-modules", "plasma-wayland-protocols", @@ -4291,10 +4376,17 @@ "wayland", "wayland-protocols" ], + "libdebconf-kde": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kiconthemes", + "ktextwidgets", + "kwidgetsaddons" + ], "libgravatar": [ "extra-cmake-modules", - "kconfigwidgets", - "pimcommon" + "kconfigwidgets" ], "libkcddb": [ "extra-cmake-modules", @@ -4425,8 +4517,8 @@ "extra-cmake-modules", "karchive", "kcmutils", + "kcolorscheme", "kconfig", - "kconfigwidgets", "kcoreaddons", "kdbusaddons", "kglobalaccel", @@ -4481,6 +4573,7 @@ "kdoctools", "kguiaddons", "ki18n", + "kiconthemes", "kwidgetsaddons", "kxmlgui", "libkdegames" @@ -4496,7 +4589,6 @@ "libkdepim", "mailimporter", "messagelib", - "phonon", "pimcommon", "plasma-activities" ], @@ -4633,6 +4725,7 @@ "kcontacts", "kcrash", "kdepim-runtime", + "kholidays", "kirigami", "kirigami-addons", "kmime", @@ -4702,6 +4795,7 @@ "kcrash", "kdbusaddons", "ki18n", + "kiconthemes", "kio", "kirigami", "kirigami-addons", @@ -4818,6 +4912,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "kio", "kitemviews", "knotifications", @@ -4889,6 +4984,7 @@ "kdbusaddons", "kdoctools", "ki18n", + "kiconthemes", "knewstuff", "kwidgetsaddons", "kxmlgui", @@ -4916,6 +5012,7 @@ "kimap", "kmailtransport", "kuserfeedback", + "kwindowsystem", "kxmlgui", "libksieve", "pimcommon", @@ -5038,6 +5135,7 @@ "baloo", "breeze", "extra-cmake-modules", + "kaccounts-integration", "kactivitymanagerd", "kauth", "kcmutils", @@ -5147,6 +5245,11 @@ "kxmlgui", "wayland" ], + "plasma-keyboard": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n" + ], "plasma-mobile": [ "bluedevil", "bluez-qt", @@ -5274,7 +5377,6 @@ "kcodecs", "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", "kdbusaddons", "ki18n", @@ -5303,12 +5405,8 @@ "kcrash", "kdbusaddons", "ki18n", - "kirigami-addons" - ], - "plasma-simplemenu": [ - "extra-cmake-modules", - "ki18n", - "libplasma" + "kirigami-addons", + "kitemmodels" ], "plasma-systemmonitor": [ "attica", @@ -5388,6 +5486,7 @@ "attica", "baloo", "extra-cmake-modules", + "kactivitymanagerd", "kauth", "kbookmarks", "kcmutils", @@ -5419,7 +5518,6 @@ "knotifyconfig", "kpackage", "kparts", - "kpipewire", "kquickcharts", "krunner", "kscreenlocker", @@ -5441,7 +5539,6 @@ "libksysguard", "libplasma", "milou", - "networkmanager-qt", "packagekit-qt", "phonon", "plasma-activities", @@ -5465,9 +5562,12 @@ "kcoreaddons", "kguiaddons", "ki18n", + "kidletime", "kio", "knotifications", "libksysguard", + "networkmanager-qt", + "plasma-activities", "solid" ], "plasmatube": [ @@ -5538,9 +5638,13 @@ "futuresql", "kconfig", "kcoreaddons", + "kcrash", "ki18n", "kirigami", "kirigami-addons", + "kitemmodels", + "kquickcharts", + "kweathercore", "qqc2-desktop-style" ], "poxml": [ @@ -5626,8 +5730,14 @@ "knotifications", "kservice", "networkmanager-qt", - "prison", - "purpose" + "prison" + ], + "rattlesnake": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami" ], "raven": [ "akonadi", @@ -5681,10 +5791,14 @@ "rolisteam": [ "extra-cmake-modules" ], + "rolisteam-diceparser": [ + "extra-cmake-modules" + ], "rsibreak": [ "extra-cmake-modules", "kconfig", "kconfigwidgets", + "kcoreaddons", "kcrash", "kdbusaddons", "kdoctools", @@ -5692,6 +5806,7 @@ "kidletime", "knotifications", "knotifyconfig", + "kstatusnotifieritem", "ktextwidgets", "kwindowsystem", "kxmlgui" @@ -5700,6 +5815,7 @@ "breeze-icons", "extra-cmake-modules", "karchive", + "kcolorscheme", "kconfig", "kcoreaddons", "kdbusaddons", @@ -5720,6 +5836,7 @@ "kwidgetsaddons", "kwindowsystem", "kxmlgui", + "plasma-activities", "prison", "purpose", "qtkeychain", @@ -5773,6 +5890,7 @@ "kcoreaddons", "kcrash", "ki18n", + "kio", "kirigami", "kquickimageeditor", "ksanecore", @@ -5810,6 +5928,8 @@ "knotifyconfig", "kparts", "krunner", + "kstatusnotifieritem", + "ktexttemplate", "kwallet", "kwidgetsaddons", "kwindowsystem", @@ -5843,6 +5963,13 @@ "qtkeychain", "solid" ], + "snap-kcm": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "ki18n" + ], "solid": [ "extra-cmake-modules" ], @@ -5962,6 +6089,7 @@ "kauth", "kcrash", "ki18n", + "ktexteditor", "kxmlgui" ], "systemsettings": [ @@ -6025,7 +6153,8 @@ "kirigami", "kirigami-addons", "kitemmodels", - "kwindowsystem" + "kwindowsystem", + "qqc2-desktop-style" ], "tokodon": [ "extra-cmake-modules", @@ -6036,6 +6165,7 @@ "kdbusaddons", "kdeclarative", "ki18n", + "kiconthemes", "kio", "kirigami", "kirigami-addons", @@ -6043,7 +6173,7 @@ "knotifications", "kunifiedpush", "kwindowsystem", - "mpvqt", + "prison", "purpose", "qqc2-desktop-style", "qtkeychain", @@ -6073,6 +6203,9 @@ "kwindowsystem", "kxmlgui" ], + "union": [ + "extra-cmake-modules" + ], "upnp-lib-qt": [ "extra-cmake-modules", "kdsoap" @@ -6128,7 +6261,11 @@ "plasma5support" ], "washipad": [ - "extra-cmake-modules" + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "ki18n", + "kirigami" ], "xdg-desktop-portal-kde": [ "extra-cmake-modules", @@ -6163,16 +6300,6 @@ "knotifications", "kwayland" ], - "xwaylandvideobridge": [ - "extra-cmake-modules", - "kcoreaddons", - "kcrash", - "ki18n", - "knotifications", - "kpipewire", - "kstatusnotifieritem", - "kwindowsystem" - ], "yakuake": [ "extra-cmake-modules", "karchive", @@ -6205,5 +6332,5 @@ "kwindowsystem" ] }, - "version": "c8684032" + "version": "7e4e118f" } \ No newline at end of file diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 3307433dd64a..c206e5b0705c 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -401,6 +401,12 @@ "project_path": "kde/workspace/aura-browser", "repo_path": "plasma/aura-browser" }, + "aurorae": { + "description": "Aurorae is a themeable window decoration for KWin", + "name": "aurorae", + "project_path": "playground/base/aurorae", + "repo_path": "plasma/aurorae" + }, "automoc": { "description": "Automoc", "name": "automoc", @@ -840,7 +846,7 @@ "repo_path": "graphics/digikam-test-data" }, "discover": { - "description": "KDE and Plasma resources management GUI", + "description": "Helps you find and install applications, games, and tools", "name": "discover", "project_path": "kde/workspace/discover", "repo_path": "plasma/discover" @@ -1112,7 +1118,7 @@ "glaxnimate": { "description": "Simple vector animation program.", "name": "glaxnimate", - "project_path": "kdereview/glaxnimate", + "project_path": "graphics/glaxnimate", "repo_path": "graphics/glaxnimate" }, "gluon": { @@ -1302,7 +1308,7 @@ "repo_path": "multimedia/kaffeine" }, "kaidan": { - "description": "Simple and user-friendly Jabber/XMPP client for every device and platform", + "description": "Modern chat app for every device", "name": "kaidan", "project_path": "kdereview/kaidan", "repo_path": "network/kaidan" @@ -1751,6 +1757,12 @@ "project_path": "kde/workspace/kde-gtk-config", "repo_path": "plasma/kde-gtk-config" }, + "kde-gui-test": { + "description": "Tool for emulating user behaviour for energy consumption measurements", + "name": "kde-gui-test", + "project_path": "playground/sdk/kde-gui-test", + "repo_path": "sdk/kde-gui-test" + }, "kde-inotify-survey": { "description": "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached.", "name": "kde-inotify-survey", @@ -3275,6 +3287,12 @@ "project_path": "kde/kdenetwork/konversation", "repo_path": "network/konversation" }, + "konvex": { + "description": "3D Model Viewer", + "name": "konvex", + "project_path": "playground/base/konvex", + "repo_path": "graphics/konvex" + }, "kooka": { "description": "Scanning application and libkscan library", "name": "kooka", @@ -3479,6 +3497,12 @@ "project_path": "frameworks/kpty", "repo_path": "frameworks/kpty" }, + "kpublicalerts": { + "description": "Public emergency and weather alert notification.", + "name": "kpublicalerts", + "project_path": "playground/utils/kpublicalerts", + "repo_path": "utilities/kpublicalerts" + }, "kpublictransport": { "description": "Library to assist with accessing public transport timetables and other data", "name": "kpublictransport", @@ -3593,6 +3617,12 @@ "project_path": "extragear/graphics/krita-extensions/krita-analogies", "repo_path": "unmaintained/krita-analogies" }, + "krita-ci-utilities": { + "description": "CI/CD utilities for Krita builds", + "name": "krita-ci-utilities", + "project_path": "playground/packaging/krita-ci-utilities", + "repo_path": "packaging/krita-ci-utilities" + }, "krita-cimg": { "description": "Extension based on the cimg library. http://cimg.sourceforge.net/", "name": "krita-cimg", @@ -3605,6 +3635,12 @@ "project_path": "extragear/graphics/krita-extensions/krita-ctlbrush", "repo_path": "unmaintained/krita-ctlbrush" }, + "krita-deps-management": { + "description": "Dependencies management for Krita builds across the various platforms it supports", + "name": "krita-deps-management", + "project_path": "playground/packaging/krita-deps-management", + "repo_path": "packaging/krita-deps-management" + }, "krita-deskew": { "description": "Deskew rotates an image such that text is straight, which is useful when dealing with scanned images.", "name": "krita-deskew", @@ -4248,11 +4284,17 @@ "repo_path": "frameworks/kwidgetsaddons" }, "kwin": { - "description": "Easy to use, but flexible, X Window Manager and Wayland Compositor", + "description": "Easy to use, but flexible, Wayland Compositor", "name": "kwin", "project_path": "kde/workspace/kwin", "repo_path": "plasma/kwin" }, + "kwin-x11": { + "description": "Easy to use, but flexible, X Window Manager", + "name": "kwin-x11", + "project_path": "kde/workspace/kwin-x11", + "repo_path": "plasma/kwin-x11" + }, "kwindowsaddons": { "description": "Runtime components for KDE software on Windows", "name": "kwindowsaddons", @@ -5483,6 +5525,12 @@ "project_path": "kde/workspace/plasma-integration", "repo_path": "plasma/plasma-integration" }, + "plasma-keyboard": { + "description": "Virtual Keyboard for Qt based desktops", + "name": "plasma-keyboard", + "project_path": "playground/workspace/plasma-keyboard", + "repo_path": "plasma/plasma-keyboard" + }, "plasma-lionmail": { "description": "A Plasma widget displaying new and important email", "name": "plasma-lionmail", @@ -5657,6 +5705,12 @@ "project_path": "kde/workspace/plasma-vault", "repo_path": "plasma/plasma-vault" }, + "plasma-wallpaper-updater": { + "description": "Tooling to assist with updating wallpapers across Plasma repositories", + "name": "plasma-wallpaper-updater", + "project_path": "plasma/plasma-wallpaper-updater", + "repo_path": "plasma/plasma-wallpaper-updater" + }, "plasma-wayland-protocols": { "description": "Plasma-specific protocols for Wayland", "name": "plasma-wayland-protocols", @@ -5760,7 +5814,7 @@ "repo_path": "plasma/powerdevil" }, "powerplant": { - "description": "A verry WIP app to keep track of your plant's needs", + "description": "An app to keep track of your plants' needs", "name": "powerplant", "project_path": "playground/utils/powerplant", "repo_path": "utilities/powerplant" @@ -6839,6 +6893,12 @@ "project_path": "kde/kdesdk/umbrello", "repo_path": "sdk/umbrello" }, + "union": { + "description": "A Qt style supporting both QtQuick and QtWidgets.", + "name": "union", + "project_path": "playground/workspace/union", + "repo_path": "plasma/union" + }, "upnp-lib-qt": { "description": "UPnP wrapper for Qt", "name": "upnp-lib-qt", @@ -7211,6 +7271,12 @@ "project_path": "websites/elisa-kde-org", "repo_path": "websites/elisa-kde-org" }, + "websites-endof10-org": { + "description": "Website for the EndOf10 initative", + "name": "websites-endof10-org", + "project_path": "websites/endof10-org", + "repo_path": "websites/endof10-org" + }, "websites-ev-kde-org": { "description": "Website for KDE e.V. - ev.kde.org", "name": "websites-ev-kde-org", diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index dc8d7afcb1c0..0ba2cd1c2df6 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -4,7 +4,6 @@ replaceVars, openssl, pkg-config, - qtkeychain, qtwayland, freerdp, wayland, @@ -21,7 +20,6 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ - qtkeychain qtwayland freerdp wayland diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 7933541b4501..4401a99d7a48 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -11,7 +11,6 @@ qtsvg, qtwayland, breeze, - kaccounts-integration, SDL2, xkeyboard_config, xorg, @@ -50,8 +49,6 @@ mkKdeDerivation { qtsvg qtwayland - kaccounts-integration - SDL2 libcanberra libwacom diff --git a/pkgs/kde/plasma/plasma5support/default.nix b/pkgs/kde/plasma/plasma5support/default.nix index b5226ca56c4a..5a23a46b1278 100644 --- a/pkgs/kde/plasma/plasma5support/default.nix +++ b/pkgs/kde/plasma/plasma5support/default.nix @@ -1,9 +1,6 @@ { mkKdeDerivation, pkg-config, - kidletime, - networkmanager-qt, - plasma-activities, gpsd, }: mkKdeDerivation { @@ -11,11 +8,5 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ - kidletime - networkmanager-qt - plasma-activities - - gpsd - ]; + extraBuildInputs = [ gpsd ]; } From e47403cf2a2c76ae218bbf519c538b0ed419fa5f Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 11 Mar 2025 09:41:21 +0100 Subject: [PATCH 323/348] SDL: point alias to SDL_compat --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccc2cdbcb237..24ecd2319494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10403,7 +10403,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - SDL = SDL1; + SDL = SDL_compat; SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; From a69699effa665d0bd917ca1b4c62f9c238534a6f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 12 Mar 2025 13:46:46 -0500 Subject: [PATCH 324/348] luajit_2_1: 2.1.1713773202 -> 2.1.1741730670 --- pkgs/development/interpreters/luajit/2.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index c151512edd1a..2db105bb6327 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -8,13 +8,13 @@ callPackage ./default.nix { # The patch version is the timestamp of the git commit, # obtain via `cat $(nix-build -A luajit_2_1.src)/.relver` - version = "2.1.1713773202"; + version = "2.1.1741730670"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "5790d253972c9d78a0c2aece527eda5b134bbbf7"; - hash = "sha256-WG8AWDI182/9O7NrZlQ6ZH/esyYE2pWXMuSzWUuntSA="; + rev = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da"; + hash = "sha256-3DhNqVdojsWDo8mKJXIyTqFODIiKzThcAzHPdnoJaVM="; }; inherit self passthruFun; From fec5bb14638e1d0812f60fc46f72d6afe337d8c5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 12 Mar 2025 14:07:04 -0500 Subject: [PATCH 325/348] luajit_2_0: 2.0.1713483859 -> 2.0.1741557863 --- pkgs/development/interpreters/luajit/2.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 0b52ff611191..c0b55e875cae 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -9,13 +9,13 @@ callPackage ./default.nix { # The patch version is the timestamp of the git commit, # obtain via `cat $(nix-build -A luajit_2_0.src)/.relver` - version = "2.0.1713483859"; + version = "2.0.1741557863"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "9b5e837ac2dfdc0638830c048a47ca9378c504d3"; - hash = "sha256-GflF/sELSNanc9G4WMzoOadUBOFSs6OwqhAXa4sudWA="; + rev = "85c3f2fb6f59276ebf07312859a69d6d5a897f62"; + hash = "sha256-5UIZ650M/0W08iX1ajaHvDbNgjbzZJ1akVwNbiDUeyY="; }; extraMeta = { From cde5248a1efb30f2f27c21974656776dbc8e7216 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 09:10:04 +0100 Subject: [PATCH 326/348] armagetronad: fix build commit 7aeac03f40021f4b213d460ef5813e52184368db (PR 386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL, which broke this build --- pkgs/games/armagetronad/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 5bab46e5b7c3..51cf2829be7f 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -19,7 +19,10 @@ SDL2, SDL2_image, SDL2_mixer, + libGL, + libGLU, libpng, + libX11, libxml2, protobuf, xvfb-run, @@ -54,6 +57,9 @@ let inherit version; src = fetchArmagetron rev hash; extraBuildInputs = lib.optionals (!dedicatedServer) [ + libGL + libGLU + libX11 libpng SDL SDL_image @@ -79,6 +85,9 @@ let glew ftgl freetype + libGL + libGLU + libX11 SDL2 SDL2_image SDL2_mixer @@ -96,6 +105,9 @@ let version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}"; src = fetchArmagetron rev hash; extraBuildInputs = lib.optionals (!dedicatedServer) [ + libGL + libGLU + libX11 libpng SDL SDL_image From d2a793d861d7a5c3f70a2f0abd7507ecf680b24e Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 11:26:05 +0100 Subject: [PATCH 327/348] hhexen: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra failure: https://hydra.nixos.org/build/292732591 --- pkgs/by-name/hh/hhexen/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/hh/hhexen/package.nix b/pkgs/by-name/hh/hhexen/package.nix index 4d994f472128..4223e1f722d1 100644 --- a/pkgs/by-name/hh/hhexen/package.nix +++ b/pkgs/by-name/hh/hhexen/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + libGL, + libGLU, SDL, SDL_mixer, autoreconfHook, @@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libGL + libGLU SDL SDL_mixer ]; From 8f57521d5bf0a68595d78319cf6ca276759c04d4 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 11:30:54 +0100 Subject: [PATCH 328/348] zaz: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra failure: https://hydra.nixos.org/build/292774821 --- pkgs/by-name/za/zaz/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/za/zaz/package.nix b/pkgs/by-name/za/zaz/package.nix index 166048c8689d..43047af5895f 100644 --- a/pkgs/by-name/za/zaz/package.nix +++ b/pkgs/by-name/za/zaz/package.nix @@ -6,6 +6,7 @@ SDL, SDL_image, libgbm, + libGL, libtheora, libvorbis, libogg, @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.getDev SDL) SDL_image libgbm + libGL libtheora libvorbis.dev libogg From c028a886f17c4f258784f30967d366bb6ec475a9 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 14:07:40 +0100 Subject: [PATCH 329/348] _1oom: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292728420 --- pkgs/by-name/_1/_1oom/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index ab64c0b300f9..2dfd5476c152 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -6,6 +6,7 @@ autoreconfHook, allegro, libsamplerate, + libGLU, libX11, libXext, SDL, @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ allegro libsamplerate + libGLU libX11 libXext SDL From 8b2f1319b4a9911eacb264c67103f8bd08084f44 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 15:19:27 +0100 Subject: [PATCH 330/348] caprice32: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292729609 --- pkgs/by-name/ca/caprice32/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ca/caprice32/package.nix b/pkgs/by-name/ca/caprice32/package.nix index a5dde1c577e3..0b173cbe4af3 100644 --- a/pkgs/by-name/ca/caprice32/package.nix +++ b/pkgs/by-name/ca/caprice32/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, desktop-file-utils, + libGLU, libpng, pkg-config, SDL, @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { pkg-config ]; buildInputs = [ + libGLU libpng SDL freetype From 57988f96f422fbcc58b26e77e32d2b20a823ce09 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 16:08:45 +0100 Subject: [PATCH 331/348] btanks: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292729441 --- pkgs/by-name/bt/btanks/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/bt/btanks/package.nix b/pkgs/by-name/bt/btanks/package.nix index 95c58f9ef018..795733f2a24b 100644 --- a/pkgs/by-name/bt/btanks/package.nix +++ b/pkgs/by-name/bt/btanks/package.nix @@ -6,7 +6,9 @@ fetchpatch, fetchurl, libGL, + libGLU, libvorbis, + libX11, lua, pkg-config, scons, @@ -62,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: { SDL_image expat libGL + libGLU + libX11 libvorbis lua smpeg From 0ebdcc7447e84c0fbdfd973f3d0d1a2e706ae5d7 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 16:33:23 +0100 Subject: [PATCH 332/348] crossfire-client: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292730126 --- pkgs/games/crossfire/crossfire-client.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix index 2f96c2bf4cc4..2d3401914109 100644 --- a/pkgs/games/crossfire/crossfire-client.nix +++ b/pkgs/games/crossfire/crossfire-client.nix @@ -9,6 +9,8 @@ gtk2, pcre, zlib, + libGL, + libGLU, libpng, fribidi, harfbuzzFull, @@ -45,6 +47,8 @@ stdenv.mkDerivation { gtk2 pcre zlib + libGL + libGLU libpng fribidi harfbuzzFull From 7a546f3018ba2f3764a13c032e6fac98ce408afd Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 18 Mar 2025 15:42:39 +0000 Subject: [PATCH 333/348] gtk4-layer-shell: fix cross compilation devdoc requires emulator to build when cross compiling --- pkgs/by-name/gt/gtk4-layer-shell/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gt/gtk4-layer-shell/package.nix b/pkgs/by-name/gt/gtk4-layer-shell/package.nix index 237d40730aaa..8a7bca4cf7ae 100644 --- a/pkgs/by-name/gt/gtk4-layer-shell/package.nix +++ b/pkgs/by-name/gt/gtk4-layer-shell/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, meson, + mesonEmulatorHook, ninja, pkg-config, gtk-doc, @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_43 vala wayland-scanner - ]; + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; buildInputs = [ gtk4 From 04df50e860f6dbdfa92cb7871bd6eb840cec888f Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 20:51:31 +0100 Subject: [PATCH 334/348] jack_oscrolloscope: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292734958 --- pkgs/by-name/ja/jack_oscrolloscope/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ja/jack_oscrolloscope/package.nix b/pkgs/by-name/ja/jack_oscrolloscope/package.nix index 82b8da7773a9..61f696842218 100644 --- a/pkgs/by-name/ja/jack_oscrolloscope/package.nix +++ b/pkgs/by-name/ja/jack_oscrolloscope/package.nix @@ -6,6 +6,7 @@ libjack2, libGLU, libGL, + libX11, pkg-config, }: @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { libjack2 libGLU libGL + libX11 ]; installPhase = '' From 438b4e3b451d783a6f4bcf67cdef02d516e2c109 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 21:18:11 +0100 Subject: [PATCH 335/348] matrix-brandy: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292743187 --- pkgs/by-name/ma/matrix-brandy/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index 13088cec236f..bf9d518783c3 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + libX11, SDL, }: @@ -17,6 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + libX11 SDL ]; From eb893cf2f135d5d241fc76bd52ae6fd43d595e8b Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 21:33:55 +0100 Subject: [PATCH 336/348] meterbridge: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292743363 --- pkgs/by-name/me/meterbridge/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/me/meterbridge/package.nix b/pkgs/by-name/me/meterbridge/package.nix index 3d285d4d8bc4..7b6e59fc55a8 100644 --- a/pkgs/by-name/me/meterbridge/package.nix +++ b/pkgs/by-name/me/meterbridge/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, pkg-config, + libGL, SDL, SDL_image, libjack2, @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ + libGL SDL SDL_image libjack2 From f768c2db63b80d9f208bb5cc03a11342b4365c59 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 18 Mar 2025 21:03:50 +0000 Subject: [PATCH 337/348] naev: fix the build after luajit update On `staging-next` `naev` fails the build as: ../src/lutf8lib.c: In function 'Lutf8_codepoint': ../src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function) 421 | if (pose - posi >= INT_MAX) /* (lua_Integer -> int) overflow? */ | ^~~~~~~ It started after commit a69699eff "luajit_2_1: 2.1.1713773202 -> 2.1.1741730670" which exposed missing include. It's already fixed upstream, but the change is a bit invasive. Let's settle on header injection. --- pkgs/by-name/na/naev/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/na/naev/package.nix b/pkgs/by-name/na/naev/package.nix index 9f52a1b623cb..e94414ba8bc2 100644 --- a/pkgs/by-name/na/naev/package.nix +++ b/pkgs/by-name/na/naev/package.nix @@ -77,6 +77,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py + + # Add a missing include to fix the build against luajit-2.1.1741730670. + # Otherwise the build fails as: + # src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function) + # TODO: drop after 0.12.3 release + sed -i '1i#include ' src/lutf8lib.c ''; meta = { From 258bfb7ed10f498374c90e5499c5477b9f23c808 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 22:31:48 +0100 Subject: [PATCH 338/348] quakespasm: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292810698 --- pkgs/games/quakespasm/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index c947356d226d..86de99a68a86 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -5,6 +5,8 @@ SDL2, fetchurl, gzip, + libGL, + libGLU, libvorbis, libmad, flac, @@ -52,6 +54,8 @@ stdenv.mkDerivation rec { buildInputs = [ gzip + libGL + libGLU libvorbis libmad flac From 2caa23f66d6e940b9a9b720139db0f644ca030f7 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 23:19:09 +0100 Subject: [PATCH 339/348] rrootage: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292771916 --- pkgs/by-name/rr/rrootage/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/rr/rrootage/package.nix b/pkgs/by-name/rr/rrootage/package.nix index 819a560d2b87..7d0813df2e37 100644 --- a/pkgs/by-name/rr/rrootage/package.nix +++ b/pkgs/by-name/rr/rrootage/package.nix @@ -3,6 +3,8 @@ stdenv, fetchpatch, fetchurl, + libGL, + libGLU, SDL, SDL_mixer, bulletml, @@ -47,6 +49,8 @@ stdenv.mkDerivation { ''; buildInputs = [ + libGL + libGLU SDL SDL_mixer bulletml From 6ee29afee9ced11afcf62af4bd1b2ef872bfd1ef Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 18 Mar 2025 19:10:13 -0400 Subject: [PATCH 340/348] smpeg: fix build on Darwin with SDL_compat --- pkgs/by-name/sm/smpeg/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sm/smpeg/package.nix b/pkgs/by-name/sm/smpeg/package.nix index 51adb5e90c79..32dc1cc52de3 100644 --- a/pkgs/by-name/sm/smpeg/package.nix +++ b/pkgs/by-name/sm/smpeg/package.nix @@ -26,10 +26,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs="; }; - patches = [ + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ ./libx11.patch ] ++ [ ./format.patch ./gcc6.patch - ./libx11.patch ./gtk.patch # These patches remove use of the `register` storage class specifier, # allowing smpeg to build with clang 16, which defaults to C++17. @@ -93,7 +92,7 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig" ''; - NIX_LDFLAGS = "-lX11"; + NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lX11"; meta = { homepage = "https://icculus.org/smpeg/"; From 6f66548b8792a81e8ad26d883475f94029458858 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 19 Mar 2025 09:07:12 +0100 Subject: [PATCH 341/348] gnujump: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292732003 --- pkgs/by-name/gn/gnujump/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gn/gnujump/package.nix b/pkgs/by-name/gn/gnujump/package.nix index d490033e08ac..1997e6d04db2 100644 --- a/pkgs/by-name/gn/gnujump/package.nix +++ b/pkgs/by-name/gn/gnujump/package.nix @@ -4,6 +4,8 @@ makeDesktopItem, copyDesktopItems, fetchurl, + libGL, + libGLU, SDL, SDL_image, SDL_mixer, @@ -19,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ + libGL + libGLU SDL SDL_image SDL_mixer From 074beeb6b7f0e4d6346103e2b8500290eb6125de Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 19 Mar 2025 09:10:55 +0100 Subject: [PATCH 342/348] azimuth: fix build commit 7aeac03 (PR #386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL_compat, and #389106 pointed SDL to SDL_compat, which broke this build Hydra fail: https://hydra.nixos.org/build/292728946 --- pkgs/by-name/az/azimuth/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix index 3a986d9c5b65..98680949229f 100644 --- a/pkgs/by-name/az/azimuth/package.nix +++ b/pkgs/by-name/az/azimuth/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + libGL, SDL, which, installTool ? false, @@ -19,7 +20,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which ]; - buildInputs = [ SDL ]; + buildInputs = [ + libGL + SDL + ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" ]; From 1c1e56fb1644fc1411bb9236d747d885e7200d32 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 20 Mar 2025 11:37:17 +0300 Subject: [PATCH 343/348] treewide: redis -> valkey Upstream Redis' last free version is going EOL soon, and often has build issues with flaky tests and such. Use Valkey, which is both fully open and actively maintained. --- pkgs/by-name/ir/irrd/package.nix | 4 ++-- pkgs/by-name/su/suricata/package.nix | 4 ++-- pkgs/by-name/za/zammad/package.nix | 4 ++-- .../python-modules/aiocache/default.nix | 2 +- .../python-modules/django-cacheops/default.nix | 2 +- .../python-modules/django-q2/default.nix | 2 +- .../python-modules/django-redis/default.nix | 2 +- .../python-modules/fakeredis/default.nix | 4 ++-- .../python-modules/flask-session/default.nix | 2 +- .../python-modules/logutils/default.nix | 4 ++-- .../python-modules/mocket/default.nix | 4 ++-- .../python-modules/python-redis-lock/default.nix | 2 +- .../python-modules/redis-om/default.nix | 2 +- pkgs/development/python-modules/rq/default.nix | 4 ++-- .../python-modules/walrus/default.nix | 2 +- pkgs/top-level/python-packages.nix | 16 ++++------------ 16 files changed, 26 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index d1c7a1903ec0..c710d94ffd30 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -6,7 +6,7 @@ , git , postgresql , postgresqlTestHook -, redis +, valkey }: let @@ -84,7 +84,7 @@ py.pkgs.buildPythonPackage rec { nativeCheckInputs = [ git - redis + valkey postgresql postgresqlTestHook ] ++ (with py.pkgs; [ diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix index 6c7006d32715..630da8c0aeca 100644 --- a/pkgs/by-name/su/suricata/package.nix +++ b/pkgs/by-name/su/suricata/package.nix @@ -27,7 +27,7 @@ python3, zlib, redisSupport ? true, - redis, + valkey, hiredis, rustSupport ? true, rustc, @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional hyperscanSupport hyperscan ++ lib.optionals redisSupport [ - redis + valkey hiredis ]; diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index 81dcd5990978..ccbb8aa3788f 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -14,7 +14,7 @@ nodejs, pnpm_9, cacert, - redis, + valkey, dataDir ? "/var/lib/zammad", }: @@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation { ]; nativeBuildInputs = [ - redis + valkey postgresql pnpm_9.configHook nodejs diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index d1e7c8b53319..1ebdfabfbdb4 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { ]; preCheck = '' - ${lib.getBin pkgs.redis}/bin/redis-server & + ${lib.getBin pkgs.valkey}/bin/redis-server & REDIS_PID=$! ${lib.getBin pkgs.memcached}/bin/memcached & diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 022a84e057d2..a8c6a968c7a4 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { jinja2 before-after nettools - pkgs.redis + pkgs.valkey ]; preCheck = '' diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix index 3f83d115764f..fd858f727e53 100644 --- a/pkgs/development/python-modules/django-q2/default.nix +++ b/pkgs/development/python-modules/django-q2/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "django_q" ]; preCheck = '' - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index 6f0bd8ee34d0..6dacbbc2e433 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { preCheck = '' export DJANGO_SETTINGS_MODULE=tests.settings.sqlite - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 0b03acd92b1f..84658d1434d0 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -12,7 +12,7 @@ pytestCheckHook, pythonOlder, redis, - redis-server, + valkey, sortedcontainers, }: @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not slow'" ]; preCheck = '' - ${lib.getExe' redis-server "redis-server"} --port 6390 & + ${lib.getExe' valkey "redis-server"} --port 6390 & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/flask-session/default.nix b/pkgs/development/python-modules/flask-session/default.nix index 3439deca8c65..9d48b8285afc 100644 --- a/pkgs/development/python-modules/flask-session/default.nix +++ b/pkgs/development/python-modules/flask-session/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; preCheck = '' - ${lib.getExe' pkgs.redis "redis-server"} & + ${lib.getExe' pkgs.valkey "redis-server"} & ${lib.getExe pkgs.memcached} & ''; diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index d9afd8823653..e3480e9fe5d3 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, pythonAtLeast, pythonOlder, - redis-server, + valkey, redis, setuptools, }: @@ -27,7 +27,7 @@ buildPythonPackage rec { substituteInPlace tests/test_dictconfig.py \ --replace-fail "assertEquals" "assertEqual" substituteInPlace tests/test_redis.py \ - --replace-fail "'redis-server'" "'${redis-server}/bin/redis-server'" + --replace-fail "'redis-server'" "'${valkey}/bin/redis-server'" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index c4d163588398..e245f281fb1c 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -29,7 +29,7 @@ pytest-cov-stub, pytestCheckHook, redis, - redis-server, + valkey, requests, sure, @@ -75,7 +75,7 @@ buildPythonPackage rec { ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' - ${redis-server}/bin/redis-server & + ${valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index a891f0a0e48c..b7fd12f2d5c7 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { gevent pytestCheckHook process-tests - pkgs.redis + pkgs.valkey ] ++ optional-dependencies.django; # For Django tests diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index c5c9c5a238d6..fd767f45f767 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { ]; preCheck = '' - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 45a173bfad46..1350c06b1265 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -14,7 +14,7 @@ # tests psutil, pytestCheckHook, - redis-server, + valkey, sentry-sdk, }: @@ -47,7 +47,7 @@ buildPythonPackage rec { preCheck = '' PATH=$out/bin:$PATH - ${redis-server}/bin/redis-server & + ${valkey}/bin/redis-server & ''; postCheck = '' diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix index 92b58509c7d6..eba324854748 100644 --- a/pkgs/development/python-modules/walrus/default.nix +++ b/pkgs/development/python-modules/walrus/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook ]; preCheck = '' - ${pkgs.redis}/bin/redis-server & + ${pkgs.valkey}/bin/redis-server & REDIS_PID=$! ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e486391f0aec..39f3aad2fd76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4561,9 +4561,7 @@ self: super: with self; { faker = callPackage ../development/python-modules/faker { }; - fakeredis = callPackage ../development/python-modules/fakeredis { - redis-server = pkgs.redis; - }; + fakeredis = callPackage ../development/python-modules/fakeredis { }; falcon = callPackage ../development/python-modules/falcon { }; @@ -7913,9 +7911,7 @@ self: super: with self; { loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { }; - logutils = callPackage ../development/python-modules/logutils { - redis-server = pkgs.redis; - }; + logutils = callPackage ../development/python-modules/logutils { }; logzero = callPackage ../development/python-modules/logzero { }; @@ -8594,9 +8590,7 @@ self: super: with self; { mobly = callPackage ../development/python-modules/mobly { }; - mocket = callPackage ../development/python-modules/mocket { - redis-server = pkgs.redis; - }; + mocket = callPackage ../development/python-modules/mocket { }; mock = callPackage ../development/python-modules/mock { }; @@ -14697,9 +14691,7 @@ self: super: with self; { rpyc = callPackage ../development/python-modules/rpyc { }; - rq = callPackage ../development/python-modules/rq { - redis-server = pkgs.redis; - }; + rq = callPackage ../development/python-modules/rq { }; rsa = callPackage ../development/python-modules/rsa { }; From 6ed2d3eef78168c949a99e9ae64a0e224f9bc733 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 20 Mar 2025 22:25:42 +0000 Subject: [PATCH 344/348] SDL_compat: re-export PKG_CHECK_MODULES macro as a build depend Without the change `powermanga` build fails on `staging-next` as https://hydra.nixos.org/build/292745998: ./configure: line 5413: syntax error near unexpected token `SDL,' ./configure: line 5413: ` PKG_CHECK_MODULES(SDL, sdl >= $min_sdl_version,' This happens because `PKG_CHECK_MODULES` definition is missing. --- pkgs/by-name/sd/SDL_compat/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index b0000e660243..bdc63084a87e 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -9,6 +9,7 @@ libX11, mesa, pkg-config, + pkg-config-unwrapped, stdenv, # Boolean flags libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, @@ -39,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { autoSignDarwinBinariesHook ]; + # re-export PKG_CHECK_MODULES m4 macro used by sdl.m4 + propagatedNativeBuildInputs = [ pkg-config-unwrapped ]; + buildInputs = [ libX11 From 3257fe5d31dc84c9ef524d8b23d565e15a5bb171 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 21 Mar 2025 09:16:22 +0300 Subject: [PATCH 345/348] python312Packages.click-option-group: fix mismerge --- pkgs/development/python-modules/click-option-group/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix index 4dc88188e2f9..93d719888186 100644 --- a/pkgs/development/python-modules/click-option-group/default.nix +++ b/pkgs/development/python-modules/click-option-group/default.nix @@ -28,9 +28,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # https://github.com/click-contrib/click-option-group/issues/65 - disabledTests = [ "test_missing_group_decl_first_api" ]; - pythonImportsCheck = [ "click_option_group" ]; disabledTests = [ From d7234272204a82f6db387d5128eb2fd07278be25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Mar 2025 13:15:21 +0100 Subject: [PATCH 346/348] python3Packages.jeepney: skip failing io tests on darwin All of these are failing with `OSError: [Errno 22] Invalid argument`. --- pkgs/development/python-modules/jeepney/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 0455732a5a83..6e36b3553650 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitLab, pythonOlder, @@ -28,19 +29,20 @@ buildPythonPackage rec { build-system = [ flit-core ]; nativeCheckInputs = [ - async-timeout dbus pytest pytest-trio pytest-asyncio testpath trio + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; checkPhase = '' runHook preCheck - dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf -- pytest + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf -- pytest ${lib.optionalString stdenv.hostPlatform.isDarwin "--ignore=jeepney/io/tests"} runHook postCheck ''; From 706797e8360a2eaf0d4f01c5c8b5b2abbecfc0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 21 Mar 2025 19:30:05 +0100 Subject: [PATCH 347/348] python3Packages.jeepney: nixfmt Otherwise CI is complaining that we regressed in this respect: https://github.com/NixOS/nixpkgs/actions/runs/13998071354/job/39198029124?pr=389579 --- .../python-modules/jeepney/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 6e36b3553650..2c03136b3372 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -28,16 +28,18 @@ buildPythonPackage rec { build-system = [ flit-core ]; - nativeCheckInputs = [ - dbus - pytest - pytest-trio - pytest-asyncio - testpath - trio - ] ++ lib.optionals (pythonOlder "3.11") [ - async-timeout - ]; + nativeCheckInputs = + [ + dbus + pytest + pytest-trio + pytest-asyncio + testpath + trio + ] + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout + ]; checkPhase = '' runHook preCheck From d0f329628446a532a54a0ed29d0e9470b4811dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 22 Mar 2025 07:43:34 +0100 Subject: [PATCH 348/348] postgresql: drop tests on aarch64-darwin, too I don't know. No progress in sight. Let's at least unblock all those dependees. --- pkgs/servers/sql/postgresql/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 9c487a14ea93..52c6e9a7d7e7 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -398,9 +398,10 @@ let # Tests just get stuck on macOS 14.x for v13 and v14 !(stdenv'.hostPlatform.isDarwin && olderThan "15") && - # Likely due to rosetta emulation: + # x86: Likely due to rosetta emulation: # FATAL: could not create shared memory segment: Cannot allocate memory - !(stdenv'.hostPlatform.isDarwin && stdenv'.hostPlatform.isx86_64); + # aarch64: not sure why, e.g. https://hydra.nixos.org/build/292573408/nixlog/7 + !(stdenv'.hostPlatform.isDarwin); installCheckTarget = "check-world"; passthru =