From 422988830438de3c381ed1b527993069b6a2c235 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:12:07 +0200 Subject: [PATCH 01/22] paulstretch: make patch urls reproducible --- pkgs/applications/audio/paulstretch/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index 5e781a9f5115..d85b543baed4 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -30,8 +30,9 @@ stdenv.mkDerivation { ]; patches = [ + # https://github.com/paulnasca/paulstretch_cpp/pull/12 (fetchpatch { - url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch"; + url = "https://github.com/paulnasca/paulstretch_cpp/commit/d8671b36135fe66839b11eadcacb474cc8dae0d1.patch"; sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4"; }) ]; From fde061116af7916e3c56fffcbc467d1cddfa8550 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:12:21 +0200 Subject: [PATCH 02/22] autotrace: make patch urls reproducible --- pkgs/applications/graphics/autotrace/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 96a53b5efbac..e611a56a6624 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + # https://github.com/autotrace/autotrace/pull/105 name = "imagemagick7-support.patch"; - url = "https://github.com/autotrace/autotrace/pull/105.patch"; + url = "https://github.com/autotrace/autotrace/compare/170488e1871d50aad7a800b901e33ded7d31773a...c26a2a059926c595a00839c8d9961e9381206579.patch"; hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0="; }) ]; From 1fb576525324d6a11f302fda9b6a84bd2fdb102e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:12:40 +0200 Subject: [PATCH 03/22] volnoti: make patch urls reproducible --- pkgs/applications/misc/volnoti/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index d70918f2e7ce..b54df7e95168 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # Fix dbus interface headers. See # https://github.com/davidbrazdil/volnoti/pull/10 (fetchpatch { - url = "https://github.com/davidbrazdil/volnoti/pull/10.patch"; + url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch"; sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; }) ]; From 17ed52d535e5536c0b3530ed4b9fd6fecefc19c2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:12:58 +0200 Subject: [PATCH 04/22] neomutt: make patch urls reproducible --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 9ac8c83dc5e7..8d0bc45c4a02 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144 ./fix-open-very-large-mailbox.patch (fetchpatch { + # https://github.com/neomutt/neomutt/pull/3933 name = "disable-incorrect-tests.patch"; - url = "https://github.com/neomutt/neomutt/pull/3933.patch"; + url = "https://github.com/neomutt/neomutt/compare/f624551b86cdb53224b5b48304a808ca2815111e...a9a1d99e6c0fdf367188125451300fa89d3e801a.patch"; hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM="; excludes = [".github/workflows/macos.yml"]; }) From 2376191fc9aa06170326a7bfadc6f0d894e95738 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:13:06 +0200 Subject: [PATCH 05/22] freenet: make patch urls reproducible --- pkgs/applications/networking/p2p/freenet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 8a46b5a476c1..3ca23647251a 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -16,8 +16,9 @@ let patches = [ # gradle 7 support + # https://github.com/freenet/fred/pull/827 (fetchpatch { - url = "https://github.com/freenet/fred/pull/827.patch"; + url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; sha256 = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; }) ]; From 7cc9e7c28ecef3021462ae77b58f9640ff66f476 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:13:18 +0200 Subject: [PATCH 06/22] vampire: make patch urls reproducible --- pkgs/applications/science/logic/vampire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 253c88705aea..a3c1aa3f131d 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { # https://github.com/vprover/vampire/pull/54 (fetchpatch { name = "fix-apple-cygwin-defines.patch"; - url = "https://github.com/vprover/vampire/pull/54.patch"; + url = "https://github.com/vprover/vampire/commit/b4bddd3bcac6a7688742da75c369b7b3213f6d1c.patch"; sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; }) # https://github.com/vprover/vampire/pull/55 (fetchpatch { name = "fix-wait-any.patch"; - url = "https://github.com/vprover/vampire/pull/55.patch"; + url = "https://github.com/vprover/vampire/commit/6da10eabb333aec54cdf13833ea33cb851159543.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) ]; From eef610491743bcbcbf2cff58ac1a7b7b3dcd12e8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:13:30 +0200 Subject: [PATCH 07/22] hub: make patch urls reproducible --- pkgs/applications/version-management/hub/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/applications/version-management/hub/default.nix index 0ed9d70c4623..4486c71605da 100644 --- a/pkgs/applications/version-management/hub/default.nix +++ b/pkgs/applications/version-management/hub/default.nix @@ -23,13 +23,15 @@ buildGoModule rec { patches = [ # Fix `fish` completions + # https://github.com/github/hub/pull/3036 (fetchpatch { - url = "https://github.com/github/hub/pull/3036.patch"; + url = "https://github.com/github/hub/commit/439b7699e79471fc789929bcdea2f30bd719963e.patch"; hash = "sha256-pR/OkGa2ICR4n1pLNx8E2UTtLeDwFtXxeeTB94KFjC4="; }) # Fix `bash` completions + # https://github.com/github/hub/pull/2948 (fetchpatch { - url = "https://github.com/github/hub/pull/2948.patch"; + url = "https://github.com/github/hub/commit/64b291006f208fc7db1d5be96ff7db5535f1d853.patch"; hash = "sha256-jGFFIvSKEIpTQY0Wz63cqciUk25MzPHv5Z1ox8l7wmo="; }) ]; From 789d8bab2f2d2fe99df97b3fc02df863ed4c6454 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:13:38 +0200 Subject: [PATCH 08/22] kodi: make patch urls reproducible --- pkgs/applications/video/kodi/unwrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index bb2c34083515..0f0008bd7a1c 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -116,7 +116,7 @@ in stdenv.mkDerivation { # Remove with the next release: https://github.com/xbmc/xbmc/pull/23453 (fetchpatch { name = "Fix fmt10 compat"; - url = "https://github.com/xbmc/xbmc/pull/23453.patch"; + url = "https://github.com/xbmc/xbmc/compare/acca69baa2eae65123e78ee2f77249181725ef5d...26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c.patch"; hash = "sha256-zMUparbQ8gfgeXj8W3MDmPi5OgLNz/zGCJINU7H6Rx0="; }) ]; From 3154cd1c7fda4b25fde0b6da24295dc4a26a7d42 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:14:25 +0200 Subject: [PATCH 09/22] arrpc: make patch urls reproducible --- pkgs/by-name/ar/arrpc/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix index 15ad34b39d7f..eeb4dd4fef25 100644 --- a/pkgs/by-name/ar/arrpc/package.nix +++ b/pkgs/by-name/ar/arrpc/package.nix @@ -21,7 +21,8 @@ buildNpmPackage { # Remove after next release patches = [ (fetchpatch { - url = "https://github.com/OpenAsar/arrpc/pull/50.patch"; + # https://github.com/OpenAsar/arrpc/pull/50 + url = "https://github.com/OpenAsar/arrpc/commit/7fa6c90204450eb3952ce9cddfecb0a5ba5e4313.patch"; hash = "sha256-qFlrbe2a4x811wpmWUcGDe2CPlt9x3HI+/t0P2v4kPc="; }) ]; From b48a8bb529d409ff08873fa6753317faa4aa5db0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:15:09 +0200 Subject: [PATCH 10/22] ghc-9.6.x: make patch urls reproducible --- .../haskell-modules/configuration-ghc-9.6.x.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 098a856f78e4..9cf010d82aa9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -254,7 +254,9 @@ self: super: { # Fix ghc-9.6.x build errors. libmpd = appendPatch - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + # https://github.com/vimus/libmpd-haskell/pull/138 + (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; + name = "vimus-libmpd-haskell-pull-138.patch"; sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; }) super.libmpd; @@ -264,8 +266,9 @@ self: super: { editedCabalFile = null; buildDepends = drv.buildDepends or [] ++ [ self.HUnit ]; patches = [(pkgs.fetchpatch { + # https://github.com/jgoerzen/configfile/pull/12 name = "ConfigFile-pr-12.patch"; - url = "https://github.com/jgoerzen/configfile/pull/12.patch"; + url = "https://github.com/jgoerzen/configfile/compare/d0a2e654be0b73eadbf2a50661d00574ad7b6f87...83ee30b43f74d2b6781269072cf5ed0f0e00012f.patch"; sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ="; })]; }) super.ConfigFile; From 85d8c838acf3f9441e65b4354a66e999b531e3d9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:15:19 +0200 Subject: [PATCH 11/22] openjpeg: make patch urls reproducible --- pkgs/development/libraries/openjpeg/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 50098de03ddf..d528e2fc0302 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { patches = [ # modernise cmake files, also fixes them for multiple outputs + # https://github.com/uclouvain/openjpeg/pull/1424 (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/pull/1424.patch"; + name = "uclouvain-openjpeg-pull-1424.patch"; + url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.patch"; sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg="; }) # fix cmake files cross compilation From f08a223dbb159efa36525a6a0a5bdb2fd274f125 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:15:26 +0200 Subject: [PATCH 12/22] python3Packages.markdown-macros: make patch urls reproducible --- pkgs/development/python-modules/markdown-macros/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index e95cbe3c4c10..e0e41bf3d0a0 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -16,8 +16,10 @@ buildPythonPackage rec { patches = [ # Fixes a bug with markdown>2.4 + # https://github.com/wnielson/markdown-macros/pull/1 (fetchpatch { - url = "https://github.com/wnielson/markdown-macros/pull/1.patch"; + name = "wnielson-markdown-macros-pull-1.patch"; + url = "https://github.com/wnielson/markdown-macros/commit/e38cba9acb6789cc128f6fe9ca427ba71815a20f.patch"; sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0"; }) ]; From 0e0c2b8201c98b94934e535ccd36b2c6f897ebed Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:15:35 +0200 Subject: [PATCH 13/22] python3Packages.pympler: make patch urls reproducible --- pkgs/development/python-modules/pympler/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 9b801e42c8a9..463de728aea2 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -19,9 +19,10 @@ buildPythonPackage rec { patches = [ # Fixes a TypeError on Python 3.11 # (see https://github.com/pympler/pympler/issues/148) + # https://github.com/pympler/pympler/pull/149 (fetchpatch { name = "${pname}-python-3.11-compat.patch"; - url = "https://github.com/pympler/pympler/pull/149.patch"; + url = "https://github.com/pympler/pympler/commit/0fd8ad8da39207bd0dcb28bdac0407e04744c965.patch"; hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U="; }) ]; From 09d21f296ae6bfbd20babd588b647ecd93cc53f8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:15:44 +0200 Subject: [PATCH 14/22] python3Packages.rocket-errbot: make patch urls reproducible --- pkgs/development/python-modules/rocket-errbot/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 29970e7fd281..65b7c62b9e34 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { # remove with 1.2.6 patches = [ (fetchpatch { - url = "https://github.com/errbotio/rocket/pull/1.patch"; + # https://github.com/errbotio/rocket/pull/1 + name = "errbotio-rocket-pull-1.patch"; + url = "https://github.com/errbotio/rocket/compare/f1a52fe17164f83bccce5e6a1935fc5071c2265f...d69adcd49de5d78bd80f952a2ee31e6a0bac4e3d.patch"; sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif"; }) ]; From 92120c7906ad7321d8bdf3f65addc249bc3b925c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:15:54 +0200 Subject: [PATCH 15/22] python3Packages.sqlalchemy-migrate: make patch urls reproducible --- pkgs/development/python-modules/sqlalchemy-migrate/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ecfa57be2e30..c71172764af7 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -26,8 +26,9 @@ buildPythonPackage rec { patches = [ # See: https://review.openstack.org/#/c/608382/ + # https://github.com/openstack/sqlalchemy-migrate/pull/18 (fetchpatch { - url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; + url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) ./python3.11-comp.diff From 20190215b0c97cbd7014fa2dda8d72d5f0acad73 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:16:03 +0200 Subject: [PATCH 16/22] python3Packages.udatetime: make patch urls reproducible, update hash --- pkgs/development/python-modules/udatetime/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 49b56c5f1e30..17011e1b9073 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -15,9 +15,11 @@ buildPythonPackage rec { patches = [ # fix build with python 3.9 + # https://github.com/freach/udatetime/pull/33 (fetchpatch { - url = "https://github.com/freach/udatetime/pull/33.patch"; - sha256 = "02wm7ivkv1viqn2wflgd10dgpddfqfrwacmrldigb1mwb79n554j"; + name = "freach-udatetime-pull-33.patch"; + url = "https://github.com/freach/udatetime/compare/75a07891426364f8bf0b44305b00bb1dd90534ae...2cfbc92cb274a80476a45c6c0d387c19e77a9f6e.patch"; + sha256 = "pPskJnie+9H3qKqf8X37sxB+CH3lpkj7IYl8HfiuV/4="; }) ]; From 291a2e809b85e209e817d1d60dafebb62d89695c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:16:12 +0200 Subject: [PATCH 17/22] orthorobot: make patch urls reproducible --- pkgs/games/orthorobot/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 6ca70596458d..10bf3f9268e6 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { patches = [ # support for love11 + # https://github.com/Stabyourself/orthorobot/pull/3 (fetchpatch { - url = "https://github.com/Stabyourself/orthorobot/pull/3.patch"; + name = "Stabyourself-orthorobot-pull-3.patch"; + url = "https://github.com/Stabyourself/orthorobot/compare/48f07423950b29a94b04aefe268f2f951f55b62e...05856ba7dbf1bb86d0f16a5f511d8ee9f2176015.patch"; sha256 = "sha256-WHHP6QM7R5eEkVF+J2pGNnds/OKRIRXyon85wjd3GXI="; }) ]; From 1a7901f8f84afe6ae8205fbf7b829d09803ecf26 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:16:25 +0200 Subject: [PATCH 18/22] numatop: make patch urls reproducible --- pkgs/os-specific/linux/numatop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index ad0138f18b75..f4995264b09e 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -16,12 +16,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/intel/numatop/pull/54.patch"; + # https://github.com/intel/numatop/pull/54 + url = "https://github.com/intel/numatop/compare/eab0ac5253c5843aa0f0ac36e2eec7612207711b...c1001fd926c24eae2d40729492e07270ce133b72.patch"; sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM="; name = "fix-string-operations.patch"; }) (fetchpatch { - url = "https://github.com/intel/numatop/pull/64.patch"; + # https://github.com/intel/numatop/pull/64 + url = "https://github.com/intel/numatop/commit/635e2ce2ccb1ac793cc276a7fcb8a92b1ffefa5d.patch"; sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM="; name = "fix-format-strings-mvwprintw.patch"; }) From 4c841565f9be019862bdc1112c263b154c25b5b9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:16:33 +0200 Subject: [PATCH 19/22] pam_p11: make patch urls reproducible --- pkgs/os-specific/linux/pam_p11/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index 8970f7ed6285..0a7e02f4ad81 100644 --- a/pkgs/os-specific/linux/pam_p11/default.nix +++ b/pkgs/os-specific/linux/pam_p11/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { patches = [ # fix with openssl 3.x + # https://github.com/OpenSC/pam_p11/pull/22 (fetchpatch { - url = "https://github.com/OpenSC/pam_p11/pull/22.patch"; + name = "OpenSC-pam_p11-pull-22.patch"; + url = "https://github.com/OpenSC/pam_p11/compare/cd4eba2e921e1c2f93cde71922a76af99376246c...debd4f7acfaf998cfe4002e0be5c35ad9a9591b5.patch"; excludes = [ ".github/build.sh" ]; hash = "sha256-bm/agnBgvrr8L8yoGK4gzBqOGgsNWf9NIgcNJG7proE="; }) From f5989166821273be8fb439536c9095ed7cec21bf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:16:44 +0200 Subject: [PATCH 20/22] sacd: make patch urls reproducible --- pkgs/tools/cd-dvd/sacd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index 963300c9ca11..948c51428402 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Makefile prefix, otherwise `/usr` prefix is enforced + # https://github.com/Sound-Linux-More/sacd/pull/1 (fetchpatch { - url = "https://github.com/Sound-Linux-More/sacd/pull/1.patch"; + url = "https://github.com/Sound-Linux-More/sacd/commit/a72def4fab234bcd68b444cf7447a8876b4e2ce8.patch"; name = "makefile-prefix.patch"; sha256 = "0a7r4x0yqpg6l4vr84dq4wbrypabqm4vvcjv91am068gqjiw6w64"; }) From 04d60bdc53e3afe9f840b055a6811fb238e85674 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:16:51 +0200 Subject: [PATCH 21/22] ciel: make patch urls reproducible --- pkgs/tools/package-management/ciel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/tools/package-management/ciel/default.nix index 7ccd34c665dc..d6040c4a0763 100644 --- a/pkgs/tools/package-management/ciel/default.nix +++ b/pkgs/tools/package-management/ciel/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { # FIXME: remove this patch after https://github.com/AOSC-Dev/ciel-rs/pull/16 is merged (fetchpatch { name = "use-canonicalize-path-to-find-libexec.patch"; - url = "https://github.com/AOSC-Dev/ciel-rs/pull/16.patch"; + url = "https://github.com/AOSC-Dev/ciel-rs/commit/17f41538ed1057e855540f5abef7faf6ea4abf5c.patch"; sha256 = "sha256-ELK2KpOuoBS774apomUIo8q1eXYs/FX895G7eBdgOQg="; }) ]; From b9e8f5a206b8b8c11c06f250725256f7de962b27 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Oct 2023 18:17:02 +0200 Subject: [PATCH 22/22] certmgr: make patch urls reproducible --- pkgs/tools/security/certmgr/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index e2318c853f11..da62e7d0568e 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -35,7 +35,9 @@ in # TODO: remove patch when PR is merged. patches = [ (fetchpatch { - url = "https://github.com/cloudflare/certmgr/pull/51.patch"; + # https://github.com/cloudflare/certmgr/pull/51 + name = "cloudflare-certmgr-pull-51.patch"; + url = "https://github.com/cloudflare/certmgr/compare/232e0adf8379db28ab74c46e0dd3eddb3cd8f2ea...55c595a4a2dc871726b3c8337469daf5597718a3.patch"; sha256 = "0jhsw159d2mgybvbbn6pmvj4yqr5cwcal5fjwkcn9m4f4zlb6qrs"; }) ];