lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* For consistency with "nix-store -q --hash", produce hashes in

Browse source 
base-32.  (This affects Hydra manifests.)
This commit is contained in:
Eelco Dolstra 2011-11-29 12:32:55 +00:00
parent 1df120cb05
commit 216440b3ff
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
perl/lib/Nix/Store.xs
View file

@ -67,7 +67,7 @@ SV * queryPathHash(char * path)
try { try {
doInit(); doInit();
Hash hash = store->queryPathHash(path); Hash hash = store->queryPathHash(path);
string s = "sha256:" + printHash(hash); string s = "sha256:" + printHash32(hash);
XPUSHs(sv_2mortal(newSVpv(s.c_str(), 0))); XPUSHs(sv_2mortal(newSVpv(s.c_str(), 0)));
} catch (Error & e) { } catch (Error & e) {
croak(e.what()); croak(e.what());

4
scripts/nix-push.in
View file

@ -198,8 +198,8 @@ for (my $n = 0; $n < scalar @storePaths; $n++) {
# In some exceptional cases (such as VM tests that use the Nix # In some exceptional cases (such as VM tests that use the Nix
# store of the host), the database doesn't contain the hash. So # store of the host), the database doesn't contain the hash. So
# compute it. # compute it.
if ($narHash eq "sha256:0000000000000000000000000000000000000000000000000000") { if ($narHash =~ /^sha256:0*$/) {
$narHash = `$binDir/nix-hash --type sha256 '$storePath'`; $narHash = `$binDir/nix-hash --type sha256 --base32 '$storePath'`;
die "cannot hash `$storePath'" if $? != 0; die "cannot hash `$storePath'" if $? != 0;
chomp $narHash; chomp $narHash;
$narHash = "sha256:$narHash"; $narHash = "sha256:$narHash";