From 0b76b065ac9fd730555bf5800530fd606ec7bf99 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:22:05 +0200 Subject: [PATCH 1/9] git-branchless: make fetchpatch url reproducible --- .../version-management/git-branchless/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index fd6213269729..8dec676a9c52 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -27,12 +27,14 @@ rustPlatform.buildRustPackage rec { patches = [ # Fix tests with Git 2.44.0+ (fetchpatch { - url = "https://github.com/arxanas/git-branchless/pull/1245.patch"; + name = "1245.patch"; # https://github.com/arxanas/git-branchless/pull/1245 + url = "https://github.com/arxanas/git-branchless/commit/c8436aed3d616409b4d6fb1eedb383077f435497.patch"; hash = "sha256-gBm0A478Uhg9IQVLQppvIeTa8s1yHUMddxiUbpHUvGw="; }) # Fix tests with Git 2.44.0+ (fetchpatch { - url = "https://github.com/arxanas/git-branchless/pull/1161.patch"; + name = "1161.patch"; # https://github.com/arxanas/git-branchless/pull/1161 + url = "https://github.com/arxanas/git-branchless/commit/6e1f26900a0dd60d10d9aa3552cab9181fa7be03.patch"; hash = "sha256-KHobEIXhlDar8CvIVUi4I695jcJZXgGRhU86b99x86Y="; }) ]; From a0b5c51f2346d79945bd09e33fce962a0db42205 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:25:32 +0200 Subject: [PATCH 2/9] modern-cpp-kafka: make fetchpatch url reproducible --- pkgs/by-name/mo/modern-cpp-kafka/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/modern-cpp-kafka/package.nix b/pkgs/by-name/mo/modern-cpp-kafka/package.nix index 7986c63aab53..ba69be491e53 100644 --- a/pkgs/by-name/mo/modern-cpp-kafka/package.nix +++ b/pkgs/by-name/mo/modern-cpp-kafka/package.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { + (fetchpatch { # https://github.com/morganstanley/modern-cpp-kafka/pull/221 name = "fix-avoid-overwriting-library-paths.patch"; - url = "https://github.com/morganstanley/modern-cpp-kafka/pull/221.patch"; + url = "https://github.com/morganstanley/modern-cpp-kafka/compare/a146d10bcf166f55299c7a55728abaaea52cb0e5...a0b5ec08315759097ce656813be57b2c38d79091.patch"; hash = "sha256-UsQcMvJoRTn5kgXhmXOyqfW3n59kGKO596U2WjtdqAY="; }) - (fetchpatch { + (fetchpatch { # https://github.com/morganstanley/modern-cpp-kafka/pull/222 name = "add-pkg-config-cmake-config.patch"; - url = "https://github.com/morganstanley/modern-cpp-kafka/pull/222.patch"; + url = "https://github.com/morganstanley/modern-cpp-kafka/commit/edc576ab83710412f6201e2bb8de5cb41682ee4a.patch"; hash = "sha256-OjoSttnpgEwSZjCVKc888xJb5f1Dulu/rQqoGmqXNM4="; }) # Fix gcc-13 build failure: From 463c72bb6e4979166e19f37ecebe397217ff784b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:25:35 +0200 Subject: [PATCH 3/9] mpvScripts.mpv-notify-send: make fetchpatch url reproducible --- pkgs/applications/video/mpv/scripts/mpv-notify-send.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 3e3a04499d08..838e30a2fabc 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -21,7 +21,8 @@ buildLua rec { patches = [ # show title of online videos instead of url (fetchpatch { - url = "https://github.com/emilazy/mpv-notify-send/pull/6.patch"; + name = "6.patch"; # https://github.com/emilazy/mpv-notify-send/pull/6 + url = "https://github.com/emilazy/mpv-notify-send/commit/948347e14890e15e89cd1e069beb1140e2d01dce.patch"; hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; }) ]; From 5c10264dd7e98e724fa912bf4e5395c13252541a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:28:26 +0200 Subject: [PATCH 4/9] python311Packages.dazl: make fetchpatch url reproducible --- pkgs/development/python-modules/dazl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index 70cd5116c585..7613795fabe9 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { patches = [ # Merged, remove this next release (fetchpatch { - url = "https://github.com/digital-asset/dazl-client/pull/428.patch"; + name = "428.patch"; # https://github.com/digital-asset/dazl-client/pull/428 + url = "https://github.com/digital-asset/dazl-client/commit/a68bad0471d22210f0abf31447a7732477de39d4.patch"; sha256 = "sha256-Gx9W1XkvMPg8FAOAXijDF5QnMbntk5mR0q5+o5i2KAE="; }) ]; From 22ca7bfea200b6944b3eeae1d9a0e3ba75dd6bed Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:29:33 +0200 Subject: [PATCH 5/9] python311Packages.pymilter: make fetchpatch url reproducible --- pkgs/development/python-modules/pymilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index d26e354d54b2..32b7cfcc9bbc 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -31,9 +31,9 @@ buildPythonPackage rec { pydns ]; patches = [ - (fetchpatch { + (fetchpatch { # https://github.com/sdgathman/pymilter/pull/57 name = "Remove-calls-to-the-deprecated-method-assertEquals"; - url = "https://github.com/sdgathman/pymilter/pull/57.patch"; + url = "https://github.com/sdgathman/pymilter/commit/1ead9028fc63ae3ec6ea3b0c438e6ed088a2b20e.patch"; hash = "sha256-/5LlDR15nMR3l7rkVjT3w4FbDTFAAgNdERWlPNL2TVg="; }) ]; From ef15362c97daaffa385c85f5b593bec2dbcfbed0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:30:19 +0200 Subject: [PATCH 6/9] python311Packages.xgboost: make fetchpatch url reproducible --- pkgs/development/libraries/xgboost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index ecb90117b6fe..e5432430cac3 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -59,9 +59,9 @@ effectiveStdenv.mkDerivation rec { }; patches = lib.optionals (cudaSupport && cudaPackages.cudaMajorMinorVersion == "12.4") [ - (fetchpatch { + (fetchpatch { # https://github.com/dmlc/xgboost/pull/10123 name = "Fix compilation with the ctk 12.4."; - url = "https://github.com/dmlc/xgboost/pull/10123.patch"; + url = "https://github.com/dmlc/xgboost/commit/c760f85db0bc7bd6379901fbfb67ceccc2b37700.patch"; hash = "sha256-iP9mll9pg8T2ztCR7dBPnLP17/x3ImJFrr5G3e2dqHo="; }) ]; From 8e1e4c64035a440870492dc6635df6412203a603 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:37:33 +0200 Subject: [PATCH 7/9] webtorrent_desktop: make fetchpatch url reproducible --- pkgs/applications/video/webtorrent_desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 75a8d9f5c639..60ef7c57cdc8 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -12,12 +12,14 @@ buildNpmPackage { patches = [ # electron 27 fix (fetchpatch { - url = "https://github.com/webtorrent/webtorrent-desktop/pull/2388.patch"; + name = "2388.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2388 + url = "https://github.com/webtorrent/webtorrent-desktop/compare/ebaf9cf8487dbd9e14a9a0c5adc3eab23b199e58...0c3e55d1f091bf66a342e2732550ebeccc2e4169.patch"; hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; }) # startup fix (fetchpatch { - url = "https://github.com/webtorrent/webtorrent-desktop/pull/2389.patch"; + name = "2389.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2389 + url = "https://github.com/webtorrent/webtorrent-desktop/commit/407046d150ed7ff876a5e1978f68630e9c8f0074.patch"; hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; }) ]; From feff02cf107840bd0c7ec8d4e3b612142ecbb12b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 10 Jun 2024 13:58:57 +0200 Subject: [PATCH 8/9] libsbml: make fetchpatch url reproducible --- pkgs/by-name/li/libsbml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix index ce895beee006..513e72f322bc 100644 --- a/pkgs/by-name/li/libsbml/package.nix +++ b/pkgs/by-name/li/libsbml/package.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation (attrs: { patches = [ # This should be in next release, remember to remove fetchpatch - (fetchpatch { + (fetchpatch { # https://github.com/sbmlteam/libsbml/pull/358 name = "fix-xmlerror-conversion.patch"; - url = "https://github.com/sbmlteam/libsbml/pull/358.patch"; + url = "https://github.com/sbmlteam/libsbml/commit/de2f77ee6766fe933a1472200f5e08e7c5ba6f8c.patch"; hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao="; }) ]; From 7e9245b3de657857257d8abd06e77073e059c1af Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 10 Jun 2024 14:10:20 +0200 Subject: [PATCH 9/9] haskell.packages.ghc98.libmpd: make fetchpatch urls reproducible --- .../development/haskell-modules/configuration-ghc-9.8.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 5248e2d3ab91..02ac104c0212 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -131,8 +131,10 @@ self: super: { hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; # Fix build with text-2.x. - libmpd = appendPatch (pkgs.fetchpatch - { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + libmpd = appendPatch + (pkgs.fetchpatch { + name = "138.patch"; # https://github.com/vimus/libmpd-haskell/pull/138 + url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...f1cbf247261641565a3937b90721f7955d254c5e.patch"; sha256 = "Q4fA2J/Tq+WernBo+UIMdj604ILOMlIYkG4Pr046DfM="; }) super.libmpd;