Add hash to builtins.path calls

This commit is contained in:
Matthew Bauer 2022-08-26 15:06:04 -05:00
parent 6e1fbe397a
commit 0b194c44aa

View file

@ -78,7 +78,10 @@ let
} else { } else {
}) })
else if info.type == "path" then else if info.type == "path" then
{ outPath = builtins.path { path = info.path; }; { outPath = builtins.path
({ path = info.path; }
// (if info ? narHash then { sha256 = info.narHash; } else {})
);
narHash = info.narHash; narHash = info.narHash;
} }
else if info.type == "tarball" then else if info.type == "tarball" then
@ -105,9 +108,13 @@ let
if builtins.substring 0 7 info.url == "http://" || builtins.substring 0 8 info.url == "https://" then if builtins.substring 0 7 info.url == "http://" || builtins.substring 0 8 info.url == "https://" then
fetchurl fetchurl
({ inherit (info) url; } ({ inherit (info) url; }
// (if info ? narHash then { sha256 = info.narHash; } else {})) // (if info ? narHash then { sha256 = info.narHash; } else {})
)
else if builtins.substring 0 7 info.url == "file://" then else if builtins.substring 0 7 info.url == "file://" then
builtins.path { path = builtins.substring 7 (-1) info.url; } builtins.path
({ path = builtins.substring 7 (-1) info.url; }
// (if info ? narHash then { sha256 = info.narHash; } else {})
)
else throw "can't support url scheme of flake input with url '${info.url}'"; else throw "can't support url scheme of flake input with url '${info.url}'";
narHash = info.narHash; narHash = info.narHash;
} }