diff options
author | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-05 15:45:33 -0400 |
---|---|---|
committer | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-05 15:45:33 -0400 |
commit | 1d2e80ddd669ef6da94c0f8c8ad734c1b0cf7d10 (patch) | |
tree | 5d114e6ef82f978857763fd2ee800c00f7c632cd /perl | |
parent | c318d398f37714c98f16b83d3afcafa856f91266 (diff) | |
parent | b3e73547a03f068ae4dd9cca4bc865cde85c8dec (diff) |
Merge branch 'master' of github.com:NixOS/nix into new-interface-for-path-pathOpt
Diffstat (limited to 'perl')
-rw-r--r-- | perl/lib/Nix/Store.xs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index a0df5df90..f588f16a0 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -224,7 +224,7 @@ SV * hashString(char * algo, int base32, char * s) SV * convertHash(char * algo, char * s, int toBase32) PPCODE: try { - Hash h(s, parseHashType(algo)); + auto h = Hash::parseAny(s, parseHashType(algo)); string s = h.to_string(toBase32 ? Base32 : Base16, false); XPUSHs(sv_2mortal(newSVpv(s.c_str(), 0))); } catch (Error & e) { @@ -285,7 +285,7 @@ SV * addToStore(char * srcPath, int recursive, char * algo) SV * makeFixedOutputPath(int recursive, char * algo, char * hash, char * name) PPCODE: try { - Hash h(hash, parseHashType(algo)); + auto h = Hash::parseAny(hash, parseHashType(algo)); auto method = recursive ? FileIngestionMethod::Recursive : FileIngestionMethod::Flat; auto path = store()->makeFixedOutputPath(method, h, name); XPUSHs(sv_2mortal(newSVpv(store()->printStorePath(path).c_str(), 0))); |