colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpatches: switch to fetchpatch2

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixpatches/flake.nix
View File

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

4
nixpatches/list.nix
View File

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