mirror of
https://github.com/NixOS/nix
synced 2024-09-19 23:03:53 -04:00
efd36b49e8
- `nix store add` supports text hashing
With functional test ensuring it matches `builtins.toFile`.
- Factored-out flags for both commands
- Move all common reusable flags to `libcmd`
- They are not part of the *definition* of the CLI infra, just a usag
of it.
- The `libstore` flag couldn't go in `args.hh` in libutil anyways,
would be awkward for it to live alone
- Shuffle around `Cmd*` hierarchy so flags for deprecated commands don't
end up on the new ones
53 lines
1.2 KiB
Bash
53 lines
1.2 KiB
Bash
source common.sh
|
|
|
|
path1=$(nix-store --add ./dummy)
|
|
echo $path1
|
|
|
|
path2=$(nix-store --add-fixed sha256 --recursive ./dummy)
|
|
echo $path2
|
|
|
|
if test "$path1" != "$path2"; then
|
|
echo "nix-store --add and --add-fixed mismatch"
|
|
exit 1
|
|
fi
|
|
|
|
path3=$(nix-store --add-fixed sha256 ./dummy)
|
|
echo $path3
|
|
test "$path1" != "$path3" || exit 1
|
|
|
|
path4=$(nix-store --add-fixed sha1 --recursive ./dummy)
|
|
echo $path4
|
|
test "$path1" != "$path4" || exit 1
|
|
|
|
hash1=$(nix-store -q --hash $path1)
|
|
echo $hash1
|
|
|
|
hash2=$(nix-hash --type sha256 --base32 ./dummy)
|
|
echo $hash2
|
|
|
|
test "$hash1" = "sha256:$hash2"
|
|
|
|
#### New style commands
|
|
|
|
clearStore
|
|
|
|
(
|
|
path1=$(nix store add ./dummy)
|
|
path2=$(nix store add --mode nar ./dummy)
|
|
path3=$(nix store add-path ./dummy)
|
|
[[ "$path1" == "$path2" ]]
|
|
[[ "$path1" == "$path3" ]]
|
|
path4=$(nix store add --mode nar --hash-algo sha1 ./dummy)
|
|
)
|
|
(
|
|
path1=$(nix store add --mode flat ./dummy)
|
|
path2=$(nix store add-file ./dummy)
|
|
[[ "$path1" == "$path2" ]]
|
|
path4=$(nix store add --mode flat --hash-algo sha1 ./dummy)
|
|
)
|
|
(
|
|
path1=$(nix store add --mode text ./dummy)
|
|
path2=$(nix eval --impure --raw --expr 'builtins.toFile "dummy" (builtins.readFile ./dummy)')
|
|
[[ "$path1" == "$path2" ]]
|
|
)
|