aboutsummaryrefslogtreecommitdiff
path: root/tests/flakes.sh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-08-30 16:38:27 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-08-30 16:38:27 +0200
commit80c36d4562af71a90c67b3adb886a1003834890e (patch)
tree82be5f00ade2b2f8ba79bb150bcd5a91965d12c1 /tests/flakes.sh
parent30ccf4e52d31ea0f1531feb8cccdc0314a41265d (diff)
Remove 'name' attribute from flakes
This is no longer needed since flakes are given an identity in the 'inputs' attribute.
Diffstat (limited to 'tests/flakes.sh')
-rw-r--r--tests/flakes.sh20
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/flakes.sh b/tests/flakes.sh
index 7c16304ec..8594a4c55 100644
--- a/tests/flakes.sh
+++ b/tests/flakes.sh
@@ -29,8 +29,6 @@ done
cat > $flake1Dir/flake.nix <<EOF
{
- name = "flake1";
-
edition = 201909;
description = "Bla bla";
@@ -48,8 +46,6 @@ git -C $flake1Dir commit -m 'Initial'
cat > $flake2Dir/flake.nix <<EOF
{
- name = "flake2";
-
edition = 201909;
description = "Fnord";
@@ -65,8 +61,6 @@ git -C $flake2Dir commit -m 'Initial'
cat > $flake3Dir/flake.nix <<EOF
{
- name = "flake3";
-
edition = 201909;
description = "Fnord";
@@ -118,12 +112,12 @@ EOF
(( $(nix flake list --flake-registry $registry | wc -l) == 5 ))
# Test 'nix flake info'.
-nix flake info --flake-registry $registry flake1 | grep -q 'ID: *flake1'
+nix flake info --flake-registry $registry flake1 | grep -q 'URI: .*flake1.*'
# Test 'nix flake info' on a local flake.
-(cd $flake1Dir && nix flake info --flake-registry $registry) | grep -q 'ID: *flake1'
-(cd $flake1Dir && nix flake info --flake-registry $registry .) | grep -q 'ID: *flake1'
-nix flake info --flake-registry $registry $flake1Dir | grep -q 'ID: *flake1'
+(cd $flake1Dir && nix flake info --flake-registry $registry) | grep -q 'URI: .*flake1.*'
+(cd $flake1Dir && nix flake info --flake-registry $registry .) | grep -q 'URI: .*flake1.*'
+nix flake info --flake-registry $registry $flake1Dir | grep -q 'URI: .*flake1.*'
# Test 'nix flake info --json'.
json=$(nix flake info --flake-registry $registry flake1 --json | jq .)
@@ -183,8 +177,6 @@ rm $flake3Dir/flake.nix
cat > $flake3Dir/flake.nix <<EOF
{
- name = "flake3";
-
edition = 201909;
description = "Fnord";
@@ -236,8 +228,6 @@ rm $flake3Dir/flake.nix
cat > $flake3Dir/flake.nix <<EOF
{
- name = "flake3";
-
edition = 201909;
inputs = {
@@ -305,8 +295,6 @@ rm $flake3Dir/flake.nix
cat > $flake3Dir/flake.nix <<EOF
{
- name = "flake3";
-
edition = 201909;
inputs = {