From 3d5fdc9ade95bb9e0bdc07c3b1e07cbe68ff311d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Aug 2023 06:15:17 +0000 Subject: [PATCH 01/19] net-snmp: 5.9.3 -> 5.9.4 --- pkgs/servers/monitoring/net-snmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 6f7e696c5d6d..2a49eda4530f 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "net-snmp"; - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { url = "mirror://sourceforge/net-snmp/${pname}-${version}.tar.gz"; - sha256 = "sha256-IJfym34b8/EwC0uuUvojCNC7jV05mNvgL5RipBOi7wo="; + sha256 = "sha256-i03gE5HnTjxwFL60OWGi1tb6A6zDQoC5WF9JMHRbBUQ="; }; patches = From c94e8021de838a13530d45930dd420806f3414dd Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 29 Aug 2023 10:18:07 -0400 Subject: [PATCH 02/19] garage: fix passthru tests attribute --- pkgs/tools/filesystems/garage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index ef4a46868cad..3bec44163d0e 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -57,7 +57,7 @@ let "sqlite" ]); - passthru = nixosTests.garage; + passthru.tests = nixosTests.garage; meta = { description = "S3-compatible object store for small self-hosted geo-distributed deployments"; From 9e18d0f6185bc5789164ddbf446df7086ec0eb2b Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 29 Aug 2023 09:13:24 -0400 Subject: [PATCH 03/19] garage: 0.8.2 -> 0.8.3 --- pkgs/tools/filesystems/garage/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 3bec44163d0e..0ac025f37a32 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -83,13 +83,13 @@ in garage_0_7 = garage_0_7_3; - garage_0_8_2 = generic { - version = "0.8.2"; - sha256 = "sha256-IlDWbNWI1yXvPPF3HIqQvo79M2FQCtoX1wRLJrDbd9k="; - cargoSha256 = "sha256-6l4tDBMcOvckTkEO05rman4hHlmVbBt1nCeX5/dETKk="; + garage_0_8_3 = generic { + version = "0.8.3"; + sha256 = "sha256-NxkFj76L+LpCWzOWbnN3zdhw9Q16uzPibDs+C+voM/0="; + cargoSha256 = "sha256-hbBuUjdlw//s6d24dPBu3R/BTJvmOW1B7tSIXNxLXlU="; }; - garage_0_8 = garage_0_8_2; + garage_0_8 = garage_0_8_3; garage = garage_0_8; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaf5dc9fb598..68bab658f492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8378,7 +8378,7 @@ with pkgs; }) garage garage_0_7 garage_0_8 - garage_0_7_3 garage_0_8_2; + garage_0_7_3 garage_0_8_3; garmin-plugin = callPackage ../applications/misc/garmin-plugin { }; From 13c151215e681f8b706d67a7c576e0d79551d1c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 21:58:38 +0000 Subject: [PATCH 04/19] luminanceHDR: 2.6.0 -> 2.6.1.1 --- pkgs/applications/graphics/luminance-hdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 97d889c285c6..257878d20f63 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "luminance-hdr"; - version = "2.6.0"; + version = "2.6.1.1"; src = fetchFromGitHub { owner = "LuminanceHDR"; repo = "LuminanceHDR"; rev = "v.${version}"; - sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn"; + sha256 = "sha256-PWqtYGx8drfMVp7D7MzN1sIUTQ+Xz5yyeHN87p2r6PY="; }; env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; From d34402032c1dc690fab7fea1344306ef751b3705 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 03:42:08 +0000 Subject: [PATCH 05/19] svgbob: 0.7.0 -> 0.7.2 --- pkgs/tools/graphics/svgbob/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 0ee757f5c812..e5974d04e1ae 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.7.0"; + version = "0.7.2"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "sha256-iWcd+23/Ou7K2YUDf/MJx84LsVMXXqAkGNPs6B0RDqA="; + sha256 = "sha256-QWDi6cpADm5zOzz8hXuqOBtVrqb0DteWmiDXC6PsLS4="; }; - cargoHash = "sha256-YbbVv2ln01nJfCaopKCwvVN7cgrcuaRHNXGHf9j9XUY="; + cargoHash = "sha256-Fj1qjG4SKlchUWW4q0tBC+9fHFFuY6MHngJCFz6J5JY="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob From fb84351aea6606093a766521afe04271f4ce4ca5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 30 Aug 2023 04:20:00 +0000 Subject: [PATCH 06/19] python310Packages.scrapy: 2.10.0 -> 2.10.1 Changelog: https://github.com/scrapy/scrapy/raw/2.10.1/docs/news.rst --- pkgs/development/python-modules/scrapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 61b3ed1e1e2d..2fd3c6ceb7db 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-ThajP8jAOli99OjUvcofhnNU6sacz1c2WMf/NPoMrjk="; + hash = "sha256-kdZ4dfu1N2B7B+MTY0RXGKNTK1RObitLr4oEKyGh0Q8="; }; nativeBuildInputs = [ From 741ed30e7738656c93b0d0dcb2be45623c8d3c64 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 29 Aug 2023 20:09:47 +0000 Subject: [PATCH 07/19] fetchDebianPatch: init --- pkgs/build-support/fetchdebianpatch/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/build-support/fetchdebianpatch/default.nix diff --git a/pkgs/build-support/fetchdebianpatch/default.nix b/pkgs/build-support/fetchdebianpatch/default.nix new file mode 100644 index 000000000000..c1230484f82b --- /dev/null +++ b/pkgs/build-support/fetchdebianpatch/default.nix @@ -0,0 +1,13 @@ +{ lib, fetchpatch }: + +lib.makeOverridable ( + { pname, version, debianRevision ? null, name, hash, area ? "main" }: + let versionString = + if debianRevision == null then version else "${version}-${debianRevision}"; + in fetchpatch { + url = + "https://sources.debian.org/data/${area}/${builtins.substring 0 1 pname}/" + + "${pname}/${versionString}/debian/patches/${name}.patch"; + inherit hash; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5575dccdfa4..e53b1fe1c65b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1173,6 +1173,8 @@ with pkgs; tests = pkgs.tests.fetchzip; }; + fetchDebianPatch = callPackage ../build-support/fetchdebianpatch { }; + fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; fetchFromGitea = callPackage ../build-support/fetchgitea { }; From 822608398927b2e5a849abc0d28d6a74afeefed2 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 29 Aug 2023 20:10:38 +0000 Subject: [PATCH 08/19] pythonPackages.pysimplesoap: simplify using `fetchDebianPatch` This can serve as both a first example, and confirmation the fetcher works. --- .../python-modules/pysimplesoap/default.nix | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/pysimplesoap/default.nix b/pkgs/development/python-modules/pysimplesoap/default.nix index 11ffdaa7aa58..b9b0bf506b8b 100644 --- a/pkgs/development/python-modules/pysimplesoap/default.nix +++ b/pkgs/development/python-modules/pysimplesoap/default.nix @@ -1,5 +1,5 @@ { lib -, fetchpatch +, fetchDebianPatch , fetchPypi , buildPythonPackage , m2crypto @@ -20,28 +20,24 @@ buildPythonPackage rec { m2crypto ]; - patches = - let - debianRevision = "5"; # The Debian package revision we get patches from - fetchDebianPatch = { name, hash }: fetchpatch { - url = "https://salsa.debian.org/python-team/packages/pysimplesoap/-/raw/debian/${version}-${debianRevision}/debian/patches/${name}.patch"; - inherit hash; - }; - in map fetchDebianPatch [ - # Merged upstream: f5f96210e1483f81cb5c582a6619e3ec4b473027 - { name = "Add-quotes-to-SOAPAction-header-in-SoapClient"; - hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; } - # Merged upstream: ad03a21cafab982eed321553c4bfcda1755182eb - { name = "fix-httplib2-version-check"; - hash = "sha256-zUeF3v0N/eMyRVRH3tQLfuUfMKOD/B/aqEwFh/7HxH4="; } - { name = "reorder-type-check-to-avoid-a-TypeError"; - hash = "sha256-2p5Cqvh0SPfJ8B38wb/xq7jWGYgpI9pavA6qkMUb6hA="; } - # Merged upstream: 033e5899e131a2c1bdf7db5852f816f42aac9227 - { name = "Support-integer-values-in-maxOccurs-attribute"; - hash = "sha256-IZ0DP7io+ihcnB5547cR53FAdnpRLR6z4J5KsNrkfaI="; } - { name = "PR204"; - hash = "sha256-JlxeTnKDFxvEMFBthZsaYRbNOoBvLJhBnXCRoiL/nVw="; } - ] ++ [ ./stringIO.patch ]; + patches = map (args: fetchDebianPatch ({ + inherit pname version; + debianRevision = "5"; + } // args)) [ + # Merged upstream: f5f96210e1483f81cb5c582a6619e3ec4b473027 + { name = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; } + # Merged upstream: ad03a21cafab982eed321553c4bfcda1755182eb + { name = "fix-httplib2-version-check"; + hash = "sha256-zUeF3v0N/eMyRVRH3tQLfuUfMKOD/B/aqEwFh/7HxH4="; } + { name = "reorder-type-check-to-avoid-a-TypeError"; + hash = "sha256-2p5Cqvh0SPfJ8B38wb/xq7jWGYgpI9pavA6qkMUb6hA="; } + # Merged upstream: 033e5899e131a2c1bdf7db5852f816f42aac9227 + { name = "Support-integer-values-in-maxOccurs-attribute"; + hash = "sha256-IZ0DP7io+ihcnB5547cR53FAdnpRLR6z4J5KsNrkfaI="; } + { name = "PR204"; + hash = "sha256-JlxeTnKDFxvEMFBthZsaYRbNOoBvLJhBnXCRoiL/nVw="; } + ] ++ [ ./stringIO.patch ]; meta = with lib; { description = "Python simple and lightweight SOAP Library"; From 7122aea5695e2d7bec80f2985e954eabe3874bd5 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 29 Aug 2023 22:01:30 +0000 Subject: [PATCH 09/19] fetchers: document fetchDebianPatch --- doc/builders/fetchers.chapter.md | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 4d4f3f427cd4..d434806aa9b2 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -82,6 +82,53 @@ Note that because the checksum is computed after applying these effects, using o Most other fetchers return a directory rather than a single file. + +## `fetchDebianPatch` {#fetchdebianpatch} + +A wrapper around `fetchpatch`, which takes: +- `name` and `hash`: the patch's filename without the `.patch` suffix, + and its hash after normalization by `fetchpatch` ; +- `pname`: the Debian source package's name ; +- `version`: the upstream version number ; +- `debianRevision`: the [Debian revision number] if applicable ; +- the `area` of the Debian archive: `main` (default), `contrib`, or `non-free`. + +Here is an example of `fetchDebianPatch` in action: + +```nix +{ lib +, fetchDebianPatch +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pysimplesoap"; + version = "1.16.2"; + src = ...; + + patches = [ + (fetchDebianPatch { + inherit pname version; + debianRevision = "5"; + name = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; + }) + ]; + + ... +} +``` + +Patches are fetched from `sources.debian.org`, and so must come from a +package version that was uploaded to the Debian archive. Packages may +be removed from there once that specific version isn't in any suite +anymore (stable, testing, unstable, etc.), so maintainers should use +`copy-tarballs.pl` to archive the patch if it needs to be available in +the very long-term. + +[Debian revision number]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version + + ## `fetchsvn` {#fetchsvn} Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash`. From d4e265327f9b98ee6bddd08f422bc0372c484193 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 30 Aug 2023 07:48:42 +0000 Subject: [PATCH 10/19] fetchDebianPatch: Rename `patch` parameter, make `name` overrideable This allows using the fetcher with `invalidateFetcherByDrvHash` for testing. --- doc/builders/fetchers.chapter.md | 2 +- pkgs/build-support/fetchdebianpatch/default.nix | 7 ++++--- .../python-modules/pysimplesoap/default.nix | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index d434806aa9b2..02c2cfe2c191 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -86,7 +86,7 @@ Most other fetchers return a directory rather than a single file. ## `fetchDebianPatch` {#fetchdebianpatch} A wrapper around `fetchpatch`, which takes: -- `name` and `hash`: the patch's filename without the `.patch` suffix, +- `patch` and `hash`: the patch's filename without the `.patch` suffix, and its hash after normalization by `fetchpatch` ; - `pname`: the Debian source package's name ; - `version`: the upstream version number ; diff --git a/pkgs/build-support/fetchdebianpatch/default.nix b/pkgs/build-support/fetchdebianpatch/default.nix index c1230484f82b..ba6aa63a732b 100644 --- a/pkgs/build-support/fetchdebianpatch/default.nix +++ b/pkgs/build-support/fetchdebianpatch/default.nix @@ -1,13 +1,14 @@ { lib, fetchpatch }: lib.makeOverridable ( - { pname, version, debianRevision ? null, name, hash, area ? "main" }: + { pname, version, debianRevision ? null, patch, hash, + area ? "main", name ? "${patch}.patch" }: let versionString = if debianRevision == null then version else "${version}-${debianRevision}"; in fetchpatch { + inherit name hash; url = "https://sources.debian.org/data/${area}/${builtins.substring 0 1 pname}/" - + "${pname}/${versionString}/debian/patches/${name}.patch"; - inherit hash; + + "${pname}/${versionString}/debian/patches/${patch}.patch"; } ) diff --git a/pkgs/development/python-modules/pysimplesoap/default.nix b/pkgs/development/python-modules/pysimplesoap/default.nix index b9b0bf506b8b..eecf54425380 100644 --- a/pkgs/development/python-modules/pysimplesoap/default.nix +++ b/pkgs/development/python-modules/pysimplesoap/default.nix @@ -25,17 +25,17 @@ buildPythonPackage rec { debianRevision = "5"; } // args)) [ # Merged upstream: f5f96210e1483f81cb5c582a6619e3ec4b473027 - { name = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + { patch = "Add-quotes-to-SOAPAction-header-in-SoapClient"; hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; } # Merged upstream: ad03a21cafab982eed321553c4bfcda1755182eb - { name = "fix-httplib2-version-check"; + { patch = "fix-httplib2-version-check"; hash = "sha256-zUeF3v0N/eMyRVRH3tQLfuUfMKOD/B/aqEwFh/7HxH4="; } - { name = "reorder-type-check-to-avoid-a-TypeError"; + { patch = "reorder-type-check-to-avoid-a-TypeError"; hash = "sha256-2p5Cqvh0SPfJ8B38wb/xq7jWGYgpI9pavA6qkMUb6hA="; } # Merged upstream: 033e5899e131a2c1bdf7db5852f816f42aac9227 - { name = "Support-integer-values-in-maxOccurs-attribute"; + { patch = "Support-integer-values-in-maxOccurs-attribute"; hash = "sha256-IZ0DP7io+ihcnB5547cR53FAdnpRLR6z4J5KsNrkfaI="; } - { name = "PR204"; + { patch = "PR204"; hash = "sha256-JlxeTnKDFxvEMFBthZsaYRbNOoBvLJhBnXCRoiL/nVw="; } ] ++ [ ./stringIO.patch ]; From e4162c9e7bc7f2a36a10e1c5e1f5ef80953d1b4b Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 30 Aug 2023 07:50:44 +0000 Subject: [PATCH 11/19] fetchDebianPatch: add test --- pkgs/build-support/fetchdebianpatch/tests.nix | 11 +++++++++++ pkgs/test/default.nix | 1 + pkgs/top-level/all-packages.nix | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/build-support/fetchdebianpatch/tests.nix diff --git a/pkgs/build-support/fetchdebianpatch/tests.nix b/pkgs/build-support/fetchdebianpatch/tests.nix new file mode 100644 index 000000000000..2146f66ce709 --- /dev/null +++ b/pkgs/build-support/fetchdebianpatch/tests.nix @@ -0,0 +1,11 @@ +{ testers, fetchDebianPatch, ... }: + +{ + simple = testers.invalidateFetcherByDrvHash fetchDebianPatch { + pname = "pysimplesoap"; + version = "1.16.2"; + debianRevision = "5"; + patch = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; + }; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b9d75c790da6..d6fd75359fc4 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -35,6 +35,7 @@ with pkgs; fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }; + fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { }; fetchzip = callPackages ../build-support/fetchzip/tests.nix { }; fetchgit = callPackages ../build-support/fetchgit/tests.nix { }; fetchFirefoxAddon = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e53b1fe1c65b..72c906ec0258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1173,7 +1173,10 @@ with pkgs; tests = pkgs.tests.fetchzip; }; - fetchDebianPatch = callPackage ../build-support/fetchdebianpatch { }; + fetchDebianPatch = callPackage ../build-support/fetchdebianpatch { } + // { + tests = pkgs.tests.fetchDebianPatch; + }; fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; From d613fb52c927a84b79039d239c3484b0e1740f70 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 30 Aug 2023 08:06:10 +0000 Subject: [PATCH 12/19] doc/fetchers: fetchDebianPatch: don't imply how long a patch remains available --- doc/builders/fetchers.chapter.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 02c2cfe2c191..ba105764904c 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -123,8 +123,8 @@ Patches are fetched from `sources.debian.org`, and so must come from a package version that was uploaded to the Debian archive. Packages may be removed from there once that specific version isn't in any suite anymore (stable, testing, unstable, etc.), so maintainers should use -`copy-tarballs.pl` to archive the patch if it needs to be available in -the very long-term. +`copy-tarballs.pl` to archive the patch if it needs to be available +longer-term. [Debian revision number]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version From 76aedfaaeeae743c94efa6962bfadf0ec6919b48 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 30 Aug 2023 08:26:52 +0000 Subject: [PATCH 13/19] fetchDebianPatch: Handle the case of `lib*` packages --- pkgs/build-support/fetchdebianpatch/default.nix | 11 ++++++++--- pkgs/build-support/fetchdebianpatch/tests.nix | 8 ++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchdebianpatch/default.nix b/pkgs/build-support/fetchdebianpatch/default.nix index ba6aa63a732b..c058b416d381 100644 --- a/pkgs/build-support/fetchdebianpatch/default.nix +++ b/pkgs/build-support/fetchdebianpatch/default.nix @@ -3,12 +3,17 @@ lib.makeOverridable ( { pname, version, debianRevision ? null, patch, hash, area ? "main", name ? "${patch}.patch" }: - let versionString = - if debianRevision == null then version else "${version}-${debianRevision}"; + let + inherit (lib.strings) hasPrefix substring; + prefix = + substring 0 (if hasPrefix "lib" pname then 4 else 1) pname; + versionString = + if debianRevision == null then version + else "${version}-${debianRevision}"; in fetchpatch { inherit name hash; url = - "https://sources.debian.org/data/${area}/${builtins.substring 0 1 pname}/" + "https://sources.debian.org/data/${area}/${prefix}/" + "${pname}/${versionString}/debian/patches/${patch}.patch"; } ) diff --git a/pkgs/build-support/fetchdebianpatch/tests.nix b/pkgs/build-support/fetchdebianpatch/tests.nix index 2146f66ce709..58f3b395d1fc 100644 --- a/pkgs/build-support/fetchdebianpatch/tests.nix +++ b/pkgs/build-support/fetchdebianpatch/tests.nix @@ -8,4 +8,12 @@ patch = "Add-quotes-to-SOAPAction-header-in-SoapClient"; hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; }; + + libPackage = testers.invalidateFetcherByDrvHash fetchDebianPatch { + pname = "libfile-pid-perl"; + version = "1.01"; + debianRevision = "2"; + patch = "missing-pidfile"; + hash = "sha256-VBsIYyCnjcZLYQ2Uq2MKPK3kF2wiMKvnq0m727DoavM="; + }; } From e8cc0f93449d8b2a915fafa49e03e9c1e0dc31d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 10:30:45 +0200 Subject: [PATCH 14/19] python311Packages.sentry-sdk: 1.29.2 -> 1.30.0 Diff: https://github.com/getsentry/sentry-python/compare/refs/tags/1.29.2...1.30.0 Changelog: https://github.com/getsentry/sentry-python/blob/1.30.0/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 94cb5ab003cc..b3953486902e 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.29.2"; + version = "1.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-etn7vkKgCN7a8Dxv4gDSVaG6mvCltVh6rTOLaKEyNRA="; + hash = "sha256-bs2Eg9eq39/LeuAWyW8FlnPULRUvQXils7OFrAEIg0w="; }; propagatedBuildInputs = [ From 53bbb203e013e8fbbcddd9f205e73674475f129a Mon Sep 17 00:00:00 2001 From: netali Date: Tue, 29 Aug 2023 21:41:23 +0200 Subject: [PATCH 15/19] postgresql12Packages.repmgr: fix build Closes: #248935 --- pkgs/servers/sql/postgresql/ext/repmgr.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 79dd4c1bdd21..61e7ee9fc965 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -8,6 +8,7 @@ , flex , curl , json_c +, libxcrypt }: stdenv.mkDerivation rec { @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - buildInputs = [ postgresql openssl zlib readline curl json_c ]; + buildInputs = [ postgresql openssl zlib readline curl json_c ] + ++ lib.optionals (stdenv.isLinux && lib.versionOlder postgresql.version "13") [ libxcrypt ]; installPhase = '' mkdir -p $out/{bin,lib,share/postgresql/extension} From 3ca4544f7c55f74d4d6e5118d4fccccefd7c50c2 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 04:18:45 -0700 Subject: [PATCH 16/19] python310Packages.gumath: patch tests to work with numpy 1.25 --- .../python-modules/gumath/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 41c0d2352c88..013662314b72 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , python , numba , ndtypes @@ -13,10 +14,26 @@ buildPythonPackage { pname = "gumath"; + format = "setuptools"; disabled = isPy27; inherit (libgumath) src version meta; + patches = [ + # https://github.com/xnd-project/gumath/pull/42 + (fetchpatch { + name = "remove-np-warnings-call.patch"; + url = "https://github.com/xnd-project/gumath/commit/83ab3aa3b07d55654b4e6e75e5ec6be8190fca97.patch"; + hash = "sha256-7lUXNVH5M+Go1iEu0bud03XI8cyGbdLNdLraMZplDaM="; + }) + (fetchpatch { + name = "remove-np-1.25-bartlett-test-assertion.patch"; + url = "https://github.com/xnd-project/gumath/commit/8741e31f2967ded08c96a7f0631e1e38fe813870.patch"; + hash = "sha256-flltk3RNPHalbcIV0BrkxWuhqqJBrycos7Fyv3P3mWg="; + }) + ]; + nativeCheckInputs = [ numba ]; + propagatedBuildInputs = [ ndtypes xnd ]; postPatch = '' @@ -42,6 +59,5 @@ buildPythonPackage { python test_xndarray.py popd ''; - } From fad0b9e9567cb75fb5f1d34ae166a480fce5714f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 30 Aug 2023 20:36:12 +0800 Subject: [PATCH 17/19] pantheon.elementary-iconbrowser: 2.1.1 -> 2.2.0 https://github.com/elementary/iconbrowser/releases/tag/2.2.0 --- .../pantheon/apps/elementary-iconbrowser/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix index 69d52292f28b..cfcf4b8e8a60 100644 --- a/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , elementary-gtk-theme @@ -18,20 +17,19 @@ stdenv.mkDerivation rec { pname = "elementary-iconbrowser"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "iconbrowser"; rev = version; - sha256 = "sha256-xooZfQmeB4rvlO8zKWnUuXPCFQNCTdjd7C53/j9EoHg="; + sha256 = "sha256-F0HxwyXAMAQyGRMhtsuKdmyyrCweM+ImJokN/KN3Kiw="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -44,11 +42,6 @@ stdenv.mkDerivation rec { gtksourceview5 ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # The GTK theme is hardcoded. From 8068ee76a29236a75409ad7fa7ee3226eb777b43 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sat, 26 Aug 2023 15:59:34 +0530 Subject: [PATCH 18/19] b4: 0.12.2 -> 0.12.3 Signed-off-by: Muhammad Falak R Wani --- pkgs/development/tools/b4/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index e6f656c4012e..24da485d863d 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4="; + hash = "sha256-tk4VBvSnHE6VnUAa3QYCqFLQbsHTJ6Bfqwa1wKEC6mI="; }; # tests make dns requests and fails @@ -24,6 +24,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; license = licenses.gpl2Only; description = "A helper utility to work with patches made available via a public-inbox archive"; - maintainers = with maintainers; [ jb55 qyliss ]; + mainProgram = "b4"; + maintainers = with maintainers; [ jb55 qyliss mfrw ]; }; } From 8dd35e19f62c50c0dca52a00661fcda7ebaa0799 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 07:19:52 -0700 Subject: [PATCH 19/19] python310Packages.pdf2docx: add pip as a build dependency --- pkgs/development/python-modules/pdf2docx/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix index fc9987d3e903..e337bf292fcf 100644 --- a/pkgs/development/python-modules/pdf2docx/default.nix +++ b/pkgs/development/python-modules/pdf2docx/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , pythonRelaxDepsHook , imagemagick +, pip , pytestCheckHook , pymupdf , fire @@ -29,7 +30,12 @@ buildPythonPackage { hash = "sha256-NrT4GURQIJbqnHstfJrPzwLXT9c2oGBi4QJ6eGIFwu4="; }; - nativeBuildInputs = [ pythonRelaxDepsHook imagemagick ]; + nativeBuildInputs = [ + pip + pythonRelaxDepsHook + imagemagick + ]; + pythonRemoveDeps = [ "opencv-python" ]; preBuild = "echo '${version}' > version.txt";