diff --git a/nixpatches/flake.nix b/nixpatches/flake.nix index d339f9e6..0edc1f64 100644 --- a/nixpatches/flake.nix +++ b/nixpatches/flake.nix @@ -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"; diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 1088bfcc..affe12d6 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -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 {})