diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-03T15·06+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-03T15·06+0000 |
commit | 64519cfd657d024ae6e2bb74cb21ad21b886fd2a (patch) | |
tree | cfcc6f0457009a392914201f8379f2cbd734d147 /tests/fixed.sh | |
parent | 09bc0c502c4a52baf0bd363d8ee5f18d49244f73 (diff) |
* Unify the treatment of sources copied to the store, and recursive
SHA-256 outputs of fixed-output derivations. I.e. they now produce the same store path: $ nix-store --add x /nix/store/j2fq9qxvvxgqymvpszhs773ncci45xsj-x $ nix-store --add-fixed --recursive sha256 x /nix/store/j2fq9qxvvxgqymvpszhs773ncci45xsj-x the latter being the same as the path that a derivation derivation { name = "x"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = "..."; ... }; produces. This does change the output path for such fixed-output derivations. Fortunately they are quite rare. The most common use is fetchsvn calls with SHA-256 hashes. (There are a handful of those is Nixpkgs, mostly unstable development packages.) * Documented the computation of store paths (in store-api.cc).
Diffstat (limited to 'tests/fixed.sh')
-rw-r--r-- | tests/fixed.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/fixed.sh b/tests/fixed.sh index 72038adfce83..9d5de2929b6f 100644 --- a/tests/fixed.sh +++ b/tests/fixed.sh @@ -34,3 +34,30 @@ clearStore drvs=$($nixinstantiate fixed.nix -A parallelSame) echo $drvs $nixstore -r $drvs -j2 + +# Fixed-output derivations with a recursive SHA-256 hash should +# produce the same path as "nix-store --add". +echo 'testing sameAsAdd...' +drv=$($nixinstantiate fixed.nix -A sameAsAdd) +echo $drv +out=$($nixstore -r $drv) +echo $out + +# This is what fixed.builder2 produces... +rm -rf $TEST_ROOT/fixed +mkdir $TEST_ROOT/fixed +mkdir $TEST_ROOT/fixed/bla +echo "Hello World!" > $TEST_ROOT/fixed/foo +ln -s foo $TEST_ROOT/fixed/bar + +out2=$($nixstore --add $TEST_ROOT/fixed) +echo $out2 +test "$out" = "$out2" || exit 1 + +out3=$($nixstore --add-fixed --recursive sha256 $TEST_ROOT/fixed) +echo $out3 +test "$out" = "$out3" || exit 1 + +out4=$($nixstore --print-fixed-path --recursive sha256 "1ixr6yd3297ciyp9im522dfxpqbkhcw0pylkb2aab915278fqaik" fixed) +echo $out4 +test "$out" = "$out4" || exit 1 |