diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/generate-patches.pl.in | 2 | ||||
| -rw-r--r-- | scripts/nix-push.in | 46 |
2 files changed, 30 insertions, 18 deletions
diff --git a/scripts/generate-patches.pl.in b/scripts/generate-patches.pl.in index baa66369d078..9392ef5c75a9 100755 --- a/scripts/generate-patches.pl.in +++ b/scripts/generate-patches.pl.in @@ -6,7 +6,7 @@ use readmanifest; die unless scalar @ARGV == 5; -my $hashAlgo = "sha1"; +my $hashAlgo = "sha256"; my $cacheDir = $ARGV[0]; my $patchesDir = $ARGV[1]; diff --git a/scripts/nix-push.in b/scripts/nix-push.in index ecc7a77af74b..c087b3e372a9 100644 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -5,6 +5,8 @@ use IPC::Open2; use POSIX qw(tmpnam); use readmanifest; +my $hashAlgo = "sha256"; + my $tmpdir; do { $tmpdir = tmpnam(); } until mkdir $tmpdir, 0777; @@ -90,7 +92,7 @@ foreach my $storePath (@storePaths) { # Construct a Nix expression that creates a Nix archive. my $nixexpr = "((import $dataDir/nix/corepkgs/nar/nar.nix) " . - "{path = \"$storePath\"; system = \"@system@\";}) "; + "{path = \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\";}) "; print NIX $nixexpr; } @@ -102,13 +104,18 @@ close NIX; # Instantiate store expressions from the Nix expression. my @storeExprs; print STDERR "instantiating store expressions...\n"; -open STOREEXPRS, "$binDir/nix-instantiate $nixfile |" or die "cannot run nix-instantiate"; -while (<STOREEXPRS>) { +my $pid = open2(\*READ, \*WRITE, "$binDir/nix-instantiate $nixfile") + or die "cannot run nix-instantiate"; +close WRITE; +while (<READ>) { chomp; die unless /^\//; push @storeExprs, $_; } -close STOREEXPRS; +close READ; + +waitpid $pid, 0; +$? == 0 or die "nix-instantiate failed"; # Realise the store expressions. @@ -123,13 +130,18 @@ while (scalar @tmp > 0) { my @tmp2 = @tmp[0..$n - 1]; @tmp = @tmp[$n..scalar @tmp - 1]; - open NARPATHS, "$binDir/nix-store --realise @tmp2 |" or die "cannot run nix-store"; - while (<NARPATHS>) { + my $pid = open2(\*READ, \*WRITE, "$binDir/nix-store --realise @tmp2") + or die "cannot run nix-store"; + close WRITE; + while (<READ>) { chomp; die unless (/^\//); push @narPaths, "$_"; } - close NARPATHS; + close READ; + + waitpid $pid, 0; + $? == 0 or die "nix-store failed"; } @@ -148,17 +160,17 @@ for (my $n = 0; $n < scalar @storePaths; $n++) { my $basename = $1; defined $basename or die; - open SHA1, "$narDir/narbz2-hash" or die "cannot open narbz2-hash"; - my $narbz2Hash = <SHA1>; + open HASH, "$narDir/narbz2-hash" or die "cannot open narbz2-hash"; + my $narbz2Hash = <HASH>; chomp $narbz2Hash; - $narbz2Hash =~ /^[0-9a-z]{32}$/ or die "invalid hash"; - close SHA1; + $narbz2Hash =~ /^[0-9a-z]+$/ or die "invalid hash"; + close HASH; - open SHA1, "$narDir/nar-hash" or die "cannot open nar-hash"; - my $narHash = <SHA1>; + open HASH, "$narDir/nar-hash" or die "cannot open nar-hash"; + my $narHash = <HASH>; chomp $narHash; - $narHash =~ /^[0-9a-z]{32}$/ or die "invalid hash"; - close SHA1; + $narHash =~ /^[0-9a-z]+$/ or die "invalid hash"; + close HASH; my $narName = "$narbz2Hash.nar.bz2"; @@ -185,9 +197,9 @@ for (my $n = 0; $n < scalar @storePaths; $n++) { } $narFiles{$storePath} = [ { url => $url - , hash => "sha1:$narbz2Hash" + , hash => "$hashAlgo:$narbz2Hash" , size => $narbz2Size - , narHash => "sha1:$narHash" + , narHash => "$hashAlgo:$narHash" , references => $references , deriver => $deriver } |