diff options
Diffstat (limited to 'nixpkgs/maintainers/scripts/find-tarballs.nix')
| -rw-r--r-- | nixpkgs/maintainers/scripts/find-tarballs.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/maintainers/scripts/find-tarballs.nix b/nixpkgs/maintainers/scripts/find-tarballs.nix index 990185bbb3bc..c47b5168abd9 100644 --- a/nixpkgs/maintainers/scripts/find-tarballs.nix +++ b/nixpkgs/maintainers/scripts/find-tarballs.nix @@ -9,17 +9,17 @@ let root = expr; - uniqueUrls = map (x: x.file) (genericClosure { - startSet = map (file: { key = file.url; inherit file; }) urls; + uniqueFiles = map (x: x.file) (genericClosure { + startSet = map (file: { key = with file; (if type == null then "" else type + "+") + hash; inherit file; }) files; operator = const [ ]; }); - urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; + files = map (drv: { urls = drv.urls or [ drv.url ]; hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat" - && drv.postFetch or "" == "" && (drv ? url || drv ? urls)) + && (drv ? url || drv ? urls)) dependencies; dependencies = map (x: x.value) (genericClosure { @@ -47,4 +47,4 @@ let canEval = val: (builtins.tryEval val).success; -in uniqueUrls +in uniqueFiles |