nixpatches: switch to fetchpatch2

fewer edgecases
This commit is contained in:
Colin 2023-06-26 10:12:00 +00:00
parent f0d7d6877b
commit f188229379
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@
name = "nixpkgs-patched-uninsane";
src = nixpkgs;
patches = import ./list.nix {
inherit (nixpkgs.legacyPackages.${system}) fetchpatch fetchurl;
inherit (nixpkgs.legacyPackages.${system}) fetchpatch2 fetchurl;
};
};
patchedFlakeFor = system: import "${patchedPkgsFor system}/flake.nix";

View File

@ -1,4 +1,4 @@
{ fetchpatch, fetchurl }:
{ fetchpatch2, fetchurl }:
let
fetchpatch' = {
saneCommit ? null,
@ -13,7 +13,7 @@ let
else
"https://git.uninsane.org/colin/nixpkgs/commit/${saneCommit}.diff"
;
in fetchpatch (
in fetchpatch2 (
{ inherit url; }
// (if hash != null then { inherit hash; } else {})
// (if title != null then { name = title; } else {})