ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-11 06:57:38 +03:00
Code Issues Projects Releases Wiki Activity

lib.fetchers.withNormalizedHash: handle fetchers whose hash parameter is optional

Browse Source
This commit is contained in:
nicoo 2024-09-15 21:07:57 +00:00
parent 0bddcc1df9
commit 39446161fc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/fetchers.nix
View File

@ -75,7 +75,7 @@ rec {
h =
let _h = attrsToList (intersectAttrs (genAttrs hNames (const {})) args); in
if _h == [] then
throw "fetcher called without `hash`"
throwIf required "fetcher called without `hash`" null
else if tail _h != [] then
throw "fetcher called with mutually-incompatible arguments: ${concatMapStringsSep ", " (a: a.name) _h}"
else
@ -85,10 +85,10 @@ rec {
if args ? "outputHash" then
args
else
removeAttrs args hNames // {
removeAttrs args hNames // (optionalAttrs (h != null) {
outputHash = h.value;
outputHashAlgo = if h.name == "hash" then null else h.name;
}
})
;
/**
@ -148,12 +148,13 @@ rec {
let
hAttrs = genAttrs ([ "hash" ] ++ hashTypes) (const {});
fArgs = functionArgs fetcher;
required = !fArgs.outputHash;
in
# The o.g. fetcher must *only* accept outputHash and outputHashAlgo
assert !fArgs.outputHash && !fArgs.outputHashAlgo;
assert fArgs ? outputHash && fArgs ? outputHashAlgo;
assert intersectAttrs fArgs hAttrs == {};
setFunctionArgs
(args: fetcher (normalizeHash { inherit hashTypes; } args))
(removeAttrs fArgs [ "outputHash" "outputHashAlgo" ] // { hash = false; });
(args: fetcher (normalizeHash { inherit hashTypes required; } args))
(removeAttrs fArgs [ "outputHash" "outputHashAlgo" ] // { hash = !required; });
}