dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lib.fetchers: optimize normalizeHash and withNormalizedHash via min-scoping

Browse Source
This commit is contained in:
nicoo 2024-09-16 09:05:29 +00:00
parent 0518f4d245
commit f470dc703c
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/fetchers.nix
View File

@ -66,14 +66,20 @@ rec {
normalizeHash = {
hashTypes ? [ "sha256" ],
required ? true,
}: args:
with builtins; with lib;
}:
let
hNames = [ "hash" ] ++ hashTypes;
hAttrs = genAttrs hNames (const {});
in
with builtins; with lib;
args:
if args ? "outputHash" then
args
else
let
# The argument hash, as a {name, value} pair
h =
let _h = attrsToList (intersectAttrs (genAttrs hNames (const {})) args); in
let _h = attrsToList (intersectAttrs hAttrs args); in
if _h == [] then
throwIf required "fetcher called without `hash`" null
else if tail _h != [] then
@ -82,9 +88,6 @@ rec {
head _h
;
in
if args ? "outputHash" then
args
else
removeAttrs args hNames // (optionalAttrs (h != null) {
outputHash = h.value;
outputHashAlgo = if h.name == "hash" then null else h.name;
@ -148,13 +151,17 @@ rec {
let
hAttrs = genAttrs ([ "hash" ] ++ hashTypes) (const {});
fArgs = functionArgs fetcher;
normalize = normalizeHash {
inherit hashTypes;
required = !fArgs.outputHash;
};
in
# The o.g. fetcher must *only* accept outputHash and outputHashAlgo
assert fArgs ? outputHash && fArgs ? outputHashAlgo;
assert intersectAttrs fArgs hAttrs == {};
setFunctionArgs
(args: fetcher (normalizeHash { inherit hashTypes required; } args))
(removeAttrs fArgs [ "outputHash" "outputHashAlgo" ] // { hash = !required; });
(args: fetcher (normalize args))
(removeAttrs fArgs [ "outputHash" "outputHashAlgo" ] // { hash = fArgs.outputHash; });
}