From b812c65f8baabac322f6d3ee0b3b7c409a5aeb90 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 3 Jan 2025 21:43:40 +0100 Subject: [PATCH] treewide: replace direct PR references to commits in patches --- pkgs/by-name/kr/krun/package.nix | 4 ++-- pkgs/by-name/re/redis/package.nix | 2 +- pkgs/by-name/rr/rrdtool/package.nix | 2 +- pkgs/by-name/va/vaapi-intel-hybrid/package.nix | 8 ++++---- pkgs/development/compilers/crystal/default.nix | 17 +++-------------- .../haskell-modules/configuration-common.nix | 4 ++-- .../development/libraries/arrayfire/default.nix | 2 +- .../python-modules/tpm2-pytss/default.nix | 2 +- 8 files changed, 15 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix index d7f6462e8810b..42e5ae505162a 100644 --- a/pkgs/by-name/kr/krun/package.nix +++ b/pkgs/by-name/kr/krun/package.nix @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { patches = [ (fetchpatch { - url = "https://github.com/slp/krun/pull/39.diff"; + url = "https://github.com/AsahiLinux/muvm/commit/622e177d51d3d162f46bd5c46524e7c391c55764.diff"; hash = "sha256-CV69L+VDDLRcWgpgDCAYKLlTU9ytFcHhzNgOibWD8KY="; }) (fetchpatch { - url = "https://github.com/slp/krun/pull/38.diff"; + url = "https://github.com/AsahiLinux/krun/commit/41abb0b0be8d4c7604b132a0e9c7f2db92c12d57.diff"; hash = "sha256-cK3iDhh+33H16V65lWUXahjmpSxI1HhiLUmkjfkRB7A="; }) ]; diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 5e008b7d4d900..69235a3b69950 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { # fixes: make test [exception]: Executing test client: permission denied # https://github.com/redis/redis/issues/12792 (fetchpatch { - url = "https://github.com/redis/redis/pull/12887.diff"; + url = "https://github.com/redis/redis/commit/bef5715374a2fe9700b690f152f314d15aa6eacd.diff"; hash = "sha256-VZEMShW7Ckn5hLJHffQvE94Uly41WZW1bwvxny+Y3W8="; }) ] diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix index 1a66700b17d9a..ba2aaec05ef49 100644 --- a/pkgs/by-name/rr/rrdtool/package.nix +++ b/pkgs/by-name/rr/rrdtool/package.nix @@ -29,7 +29,7 @@ perl.pkgs.toPerlModule ( # Fix darwin build patches = lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { - url = "https://github.com/oetiker/rrdtool-1.x/pull/1262.patch"; + url = "https://github.com/oetiker/rrdtool-1.x/commit/98b2944d3b41f6e19b6a378d7959f569fdbaa9cd.diff"; hash = "sha256-aP0rmDlILn6VC8Tg7HpRXbxL9+KD/PRTbXnbQ7HgPEg="; }); diff --git a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix index 564460b104bc0..fc44aacfec2df 100644 --- a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix +++ b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchpatch2, fetchFromGitHub, autoreconfHook, pkg-config, @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { patches = [ # driver_init: load libva-x11.so for any ABI version - (fetchurl { - url = "https://github.com/01org/intel-hybrid-driver/pull/26.diff"; - sha256 = "1ql4mbi5x1d2a5c8mkjvciaq60zj8nhx912992winbhfkyvpb3gx"; + (fetchpatch2 { + url = "https://github.com/intel/intel-hybrid-driver/commit/b3b4d9a3a08d48bf6022723908a22255cc271ab7.diff?full_index=1"; + hash = "sha256-aUW0hMQuB7J3yVOUhpS2MvQu17uR6VKpSJbgazVmFfU="; }) ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 0468bca709a7d..901b2cd3760e0 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -50,8 +50,6 @@ let binaryUrl = version: rel: if arch == archs.aarch64-linux then "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" - else if arch == archs.x86_64-darwin && lib.versionOlder version "1.2.0" then - "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-darwin-x86_64.tar.gz" else "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; @@ -95,18 +93,9 @@ let }; patches = [ - (substituteAll { - src = ./tzdata.patch; - inherit tzdata; - }) - ] - ++ lib.optionals (lib.versionOlder version "1.2.0") [ - # add support for DWARF5 debuginfo, fixes builds on recent compilers - # the PR is 8 commits from 2019, so just fetch the whole thing - # and hope it doesn't change - (fetchpatch { - url = "https://github.com/crystal-lang/crystal/pull/11399.patch"; - sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8="; + (substituteAll { + src = ./tzdata.patch; + inherit tzdata; }) ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 35d86edb72979..d7858a32ce9ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2558,8 +2558,8 @@ self: super: { # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20) polynomial = appendPatch (fetchpatch { name = "haskell-polynomial.20.patch"; - url = "https://github.com/mokus0/polynomial/pull/20.diff"; - sha256 = "1bwivimpi2hiil3zdnl5qkds1inyn239wgxbn3y8l2pwyppnnfl0"; + url = "https://github.com/mokus0/polynomial/compare/42fde2c9a72f449eeda4d534acfe64b8e92b5c27...109686b52c8bdace29f92f83d1458b33391e2afa.diff"; + hash = "sha256-gDpr7/X8Cor8sKs/noaw3sag28SF2vYHjRGKeGvcka8="; }) (overrideCabal (drv: { revision = null; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index c33e6f4cbfe25..78ee0a0296bde 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { ./no-download.patch # Fix for newer opencl-clhpp. Remove with the next release. (fetchpatch { - url = "https://github.com/arrayfire/arrayfire/pull/3562.patch"; + url = "https://github.com/arrayfire/arrayfire/commit/48a97be35f3892044094172d8fe9db586ccb601a.diff"; hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50"; }) ]; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 7ca0bb688a411..36e67c3f96198 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # libtpms (underneath swtpm) bumped the TPM revision # https://github.com/tpm2-software/tpm2-pytss/pull/593 (fetchpatch { - url = "https://github.com/tpm2-software/tpm2-pytss/pull/593.patch"; + url = "https://github.com/tpm2-software/tpm2-pytss/commit/146c3f4442f48d634297487b7f215c0d42e30f36.diff"; hash = "sha256-CNJnSIvUQ0Yvy0o7GdVfFZ7kHJd2hBt5Zv1lqgOeoks="; }) ]