nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 06:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

More quote coalescing

Browse Source
This commit is contained in:
John Ericson 2024-06-12 17:47:54 -04:00
parent d8ae28617d
commit 33241887d1
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/functional/flakes/init.sh
View File

@ -8,8 +8,8 @@ templatesDir=$TEST_ROOT/templates
flakeDir=$TEST_ROOT/flake flakeDir=$TEST_ROOT/flake
nixpkgsDir=$TEST_ROOT/nixpkgs nixpkgsDir=$TEST_ROOT/nixpkgs
nix registry add --registry "$registry" templates git+file://"$templatesDir" nix registry add --registry "$registry" templates "git+file://$templatesDir"
nix registry add --registry "$registry" nixpkgs git+file://"$nixpkgsDir" nix registry add --registry "$registry" nixpkgs "git+file://$nixpkgsDir"
createGitRepo "$nixpkgsDir" createGitRepo "$nixpkgsDir"
createSimpleGitFlake "$nixpkgsDir" createSimpleGitFlake "$nixpkgsDir"

24
tests/functional/flakes/mercurial.sh
View File

@ -9,7 +9,7 @@ mkdir -p "$flake1Dir"
writeSimpleFlake "$flake1Dir" writeSimpleFlake "$flake1Dir"
hg init "$flake1Dir" hg init "$flake1Dir"
nix registry add --registry "$registry" flake1 hg+file://"$flake1Dir" nix registry add --registry "$registry" flake1 "hg+file://$flake1Dir"
flake2Dir=$TEST_ROOT/flake-hg2 flake2Dir=$TEST_ROOT/flake-hg2
mkdir -p "$flake2Dir" mkdir -p "$flake2Dir"
@ -22,24 +22,24 @@ hg commit --config ui.username=foobar@example.org "$flake1Dir" -m 'Initial commi
hg add "$flake2Dir"/flake.nix hg add "$flake2Dir"/flake.nix
hg commit --config ui.username=foobar@example.org "$flake2Dir" -m 'Initial commit' hg commit --config ui.username=foobar@example.org "$flake2Dir" -m 'Initial commit'
nix build -o "$TEST_ROOT/result" hg+file://"$flake2Dir" nix build -o "$TEST_ROOT/result" "hg+file://$flake2Dir"
[[ -e $TEST_ROOT/result/hello ]] [[ -e $TEST_ROOT/result/hello ]]
(! nix flake metadata --json hg+file://"$flake2Dir" | jq -e -r .revision) (! nix flake metadata --json "hg+file://$flake2Dir" | jq -e -r .revision)
nix eval hg+file://"$flake2Dir"#expr nix eval "hg+file://$flake2Dir"#expr
nix eval hg+file://"$flake2Dir"#expr nix eval "hg+file://$flake2Dir"#expr
(! nix eval hg+file://"$flake2Dir"#expr --no-allow-dirty) (! nix eval "hg+file://$flake2Dir"#expr --no-allow-dirty)
(! nix flake metadata --json hg+file://"$flake2Dir" | jq -e -r .revision) (! nix flake metadata --json "hg+file://$flake2Dir" | jq -e -r .revision)
hg commit --config ui.username=foobar@example.org "$flake2Dir" -m 'Add lock file' hg commit --config ui.username=foobar@example.org "$flake2Dir" -m 'Add lock file'
nix flake metadata --json hg+file://"$flake2Dir" --refresh | jq -e -r .revision nix flake metadata --json "hg+file://$flake2Dir" --refresh | jq -e -r .revision
nix flake metadata --json hg+file://"$flake2Dir" nix flake metadata --json "hg+file://$flake2Dir"
[[ $(nix flake metadata --json hg+file://"$flake2Dir" | jq -e -r .revCount) = 1 ]] [[ $(nix flake metadata --json "hg+file://$flake2Dir" | jq -e -r .revCount) = 1 ]]
nix build -o "$TEST_ROOT/result" hg+file://"$flake2Dir" --no-registries --no-allow-dirty nix build -o "$TEST_ROOT/result" "hg+file://$flake2Dir" --no-registries --no-allow-dirty
nix build -o "$TEST_ROOT/result" hg+file://"$flake2Dir" --no-use-registries --no-allow-dirty nix build -o "$TEST_ROOT/result" "hg+file://$flake2Dir" --no-use-registries --no-allow-dirty