public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix copy-tarballs.pl

Browse Source
This commit is contained in:
Eelco Dolstra
2019-01-24 16:01:49 +01:00
parent fbd7d43c39
commit 11cf7d6e1f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/scripts/copy-tarballs.pl
+1 -1
View File
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings #! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings
# This command uploads tarballs to tarballs.nixos.org, the # This command uploads tarballs to tarballs.nixos.org, the
# content-addressed cache used by fetchurl as a fallback for when # content-addressed cache used by fetchurl as a fallback for when
maintainers/scripts/find-tarballs.nix
+1 -1
View File
@@ -31,7 +31,7 @@ let
if !canEval x then [] if !canEval x then []
else if isDerivation x then optional (canEval x.drvPath) x else if isDerivation x then optional (canEval x.drvPath) x
else if isList x then concatLists (map derivationsIn' x) else if isList x then concatLists (map derivationsIn' x)
else if isAttrs x then concatLists (mapAttrsToList (n: v: derivationsIn' v) x) else if isAttrs x then concatLists (mapAttrsToList (n: v: addErrorContext "while finding tarballs in '${n}':" (derivationsIn' v)) x)
else [ ]; else [ ];
keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { }; keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { };