Merge #1100 nuke submodule, add testsuite, upd dev-env nixpkgs-unstable

.github/workflows/Optional-Nix-dev-env-macOS.yml

@@ -7,7 +7,7 @@ on:
 
 
 env:
-  rev: "272fad732d39b24c4549c475176e0d8cbc8c897a"
+  rev: "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad"
   cachixAccount: "hnix"
   CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
   doCheck: "false"

.github/workflows/Optional-Nix-dev-env-main.yml

@@ -22,7 +22,7 @@ env:
   ### and the other part of keys explained in `build.sh`, since those address external procedures aound the builds.
   ### Additional documentation is in Nixpkgs Haskell.lib: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/lib.nix
   ###
-  rev: "272fad732d39b24c4549c475176e0d8cbc8c897a"
+  rev: "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad"
   cachixAccount: "hnix"
   CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
   allowInconsistentDependencies: "false"

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "data/nix"]
-	path = data/nix
-	url = https://github.com/haskell-nix/nix

ReadMe.md

@@ -21,7 +21,7 @@ Tooling is WIP, `nix-shell` and `nix-store` are still used for their purpose, so
 ### Git clone
 
 ```shell
-git clone --recursive 'https://github.com/haskell-nix/hnix.git' && cd hnix
+git clone 'https://github.com/haskell-nix/hnix.git' && cd hnix
 ```
 
 
@@ -300,9 +300,6 @@ hnix \
 
     ```shell
     cabal v2-test
-
-    # If forgot to clone recursively, run:
-    # git submodule update --init --recursive
     ```
 
     Please, check that all default tests that were passing prior are still passing. It's OK if no new tests are passing.

data/nix/README.md

@@ -0,0 +1,5 @@
+Extracted from https://github.com/NixOS/nix (GPLv2)
+commit 6c2af1f201a925c2aa632737765685c72b642847
+Date:   Mon Nov 8 14:13:42 202
+
+Keep only `tests/lang` which are required by `hnix`es testsuite.

data/nix/tests/lang/data

@@ -0,0 +1 @@
+foo

data/nix/tests/lang/dir1/a.nix

@@ -0,0 +1 @@
+"a"

data/nix/tests/lang/dir2/a.nix

@@ -0,0 +1 @@
+"X"

data/nix/tests/lang/dir2/b.nix

@@ -0,0 +1 @@
+"b"

data/nix/tests/lang/dir3/a.nix

@@ -0,0 +1 @@
+"X"

data/nix/tests/lang/dir3/b.nix

@@ -0,0 +1 @@
+"X"

data/nix/tests/lang/dir3/c.nix

@@ -0,0 +1 @@
+"c"

data/nix/tests/lang/dir4/a.nix

@@ -0,0 +1 @@
+"X"

data/nix/tests/lang/dir4/c.nix

@@ -0,0 +1 @@
+"X"

data/nix/tests/lang/eval-fail-abort.nix

@@ -0,0 +1 @@
+if true then abort "this should fail" else 1

data/nix/tests/lang/eval-fail-assert.nix

@@ -0,0 +1,5 @@
+let {
+  x = arg: assert arg == "y"; 123;
+
+  body = x "x";
+}

data/nix/tests/lang/eval-fail-bad-antiquote-1.nix

@@ -0,0 +1 @@
+"${x: x}"

data/nix/tests/lang/eval-fail-bad-antiquote-2.nix

@@ -0,0 +1 @@
+"${./fnord}"

data/nix/tests/lang/eval-fail-bad-antiquote-3.nix

@@ -0,0 +1 @@
+''${x: x}''

data/nix/tests/lang/eval-fail-blackhole.nix

@@ -0,0 +1,5 @@
+let {
+  body = x;
+  x = y;
+  y = x;
+}

data/nix/tests/lang/eval-fail-deepseq.nix

@@ -0,0 +1 @@
+builtins.deepSeq { x = abort "foo"; } 456

data/nix/tests/lang/eval-fail-hashfile-missing.nix

@@ -0,0 +1,5 @@
+let
+  paths = [ ./this-file-is-definitely-not-there-7392097 "/and/neither/is/this/37293620" ];
+in
+  toString (builtins.concatLists (map (hash: map (builtins.hashFile hash) paths) ["md5" "sha1" "sha256" "sha512"]))
+

data/nix/tests/lang/eval-fail-missing-arg.nix

@@ -0,0 +1 @@
+({x, y, z}: x + y + z) {x = "foo"; z = "bar";}

data/nix/tests/lang/eval-fail-nonexist-path.nix

@@ -0,0 +1,4 @@
+# This must fail to evaluate, since ./fnord doesn't exist.  If it did
+# exist, it would produce "/nix/store/<hash>-fnord/xyzzy" (with an
+# appropriate context).
+"${./fnord}/xyzzy"

data/nix/tests/lang/eval-fail-path-slash.nix

@@ -0,0 +1,6 @@
+# Trailing slashes in paths are not allowed.
+# This restriction could be lifted sometime,
+# for example if we make '/' a path concatenation operator.
+# See https://github.com/NixOS/nix/issues/1138
+# and https://nixos.org/nix-dev/2016-June/020829.html
+/nix/store/

data/nix/tests/lang/eval-fail-remove.nix

@@ -0,0 +1,5 @@
+let {
+  attrs = {x = 123; y = 456;};
+
+  body = (removeAttrs attrs ["x"]).x;
+}

data/nix/tests/lang/eval-fail-scope-5.nix

@@ -0,0 +1,10 @@
+let {
+
+  x = "a";
+  y = "b";
+
+  f = {x ? y, y ? x}: x + y;
+
+  body = f {};
+
+}

data/nix/tests/lang/eval-fail-seq.nix

@@ -0,0 +1 @@
+builtins.seq (abort "foo") 2

data/nix/tests/lang/eval-fail-substring.nix

@@ -0,0 +1 @@
+builtins.substring (builtins.sub 0 1) 1 "x"

data/nix/tests/lang/eval-fail-to-path.nix

@@ -0,0 +1 @@
+builtins.toPath "foo/bar"

data/nix/tests/lang/eval-fail-undeclared-arg.nix

@@ -0,0 +1 @@
+({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";}

data/nix/tests/lang/eval-okay-any-all.exp

@@ -0,0 +1 @@
+[ false false true true true true false true ]

data/nix/tests/lang/eval-okay-any-all.nix

@@ -0,0 +1,11 @@
+with builtins;
+
+[ (any (x: x == 1) [])
+  (any (x: x == 1) [2 3 4])
+  (any (x: x == 1) [1 2 3 4])
+  (any (x: x == 1) [4 3 2 1])
+  (all (x: x == 1) [])
+  (all (x: x == 1) [1])
+  (all (x: x == 1) [1 2 3])
+  (all (x: x == 1) [1 1 1])
+]

data/nix/tests/lang/eval-okay-arithmetic.exp

@@ -0,0 +1 @@
+2216

data/nix/tests/lang/eval-okay-arithmetic.nix

@@ -0,0 +1,59 @@
+with import ./lib.nix;
+
+let {
+
+  /* Supposedly tail recursive version:
+
+  range_ = accum: first: last:
+    if first == last then ([first] ++ accum)
+    else range_ ([first] ++ accum) (builtins.add first 1) last;
+
+  range = range_ [];
+  */
+
+  x = 12;
+
+  err = abort "urgh";
+
+  body = sum
+    [ (sum (range 1 50))
+      (123 + 456)
+      (0 + -10 + -(-11) + -x)
+      (10 - 7 - -2)
+      (10 - (6 - -1))
+      (10 - 1 + 2)
+      (3 * 4 * 5)
+      (56088 / 123 / 2)
+      (3 + 4 * const 5 0 - 6 / id 2)
+
+      (builtins.bitAnd 12 10) # 0b1100 & 0b1010 =  8
+      (builtins.bitOr  12 10) # 0b1100 | 0b1010 = 14
+      (builtins.bitXor 12 10) # 0b1100 ^ 0b1010 =  6
+
+      (if 3 < 7 then 1 else err)
+      (if 7 < 3 then err else 1)
+      (if 3 < 3 then err else 1)
+
+      (if 3 <= 7 then 1 else err)
+      (if 7 <= 3 then err else 1)
+      (if 3 <= 3 then 1 else err)
+
+      (if 3 > 7 then err else 1)
+      (if 7 > 3 then 1 else err)
+      (if 3 > 3 then err else 1)
+
+      (if 3 >= 7 then err else 1)
+      (if 7 >= 3 then 1 else err)
+      (if 3 >= 3 then 1 else err)
+
+      (if 2 > 1 == 1 < 2 then 1 else err)
+      (if 1 + 2 * 3 >= 7 then 1 else err)
+      (if 1 + 2 * 3 < 7 then err else 1)
+
+      # Not integer, but so what.
+      (if "aa" < "ab" then 1 else err)
+      (if "aa" < "aa" then err else 1)
+      (if "foo" < "foobar" then 1 else err)
+    ];
+
+}

data/nix/tests/lang/eval-okay-attrnames.exp

@@ -0,0 +1 @@
+"newxfoonewxy"

data/nix/tests/lang/eval-okay-attrnames.nix

@@ -0,0 +1,11 @@
+with import ./lib.nix;
+
+let
+
+  attrs = {y = "y"; x = "x"; foo = "foo";} // rec {x = "newx"; bar = x;};
+
+  names = builtins.attrNames attrs;
+
+  values = map (name: builtins.getAttr name attrs) names;
+
+in assert values == builtins.attrValues attrs; concat values

data/nix/tests/lang/eval-okay-attrs.exp

@@ -0,0 +1 @@
+987

data/nix/tests/lang/eval-okay-attrs.nix

@@ -0,0 +1,5 @@
+let {
+  as = { x = 123; y = 456; } // { z = 789; } // { z = 987; };
+
+  body = if as ? a then as.a else assert as ? z; as.z;
+}

data/nix/tests/lang/eval-okay-attrs2.exp

@@ -0,0 +1 @@
+987

data/nix/tests/lang/eval-okay-attrs2.nix

@@ -0,0 +1,10 @@
+let {
+  as = { x = 123; y = 456; } // { z = 789; } // { z = 987; };
+
+  A = "a";
+  Z = "z";
+
+  body = if builtins.hasAttr A as
+         then builtins.getAttr A as
+         else assert builtins.hasAttr Z as; builtins.getAttr Z as;
+}

data/nix/tests/lang/eval-okay-attrs3.exp

@@ -0,0 +1 @@
+"foo 22 80 itchyxac"

data/nix/tests/lang/eval-okay-attrs3.nix

@@ -0,0 +1,22 @@
+let
+
+  config = 
+    {
+      services.sshd.enable = true;
+      services.sshd.port = 22;
+      services.httpd.port = 80;
+      hostName = "itchy";
+      a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z = "x";
+      foo = {
+        a = "a";
+        b.c = "c";
+      };
+    };
+
+in
+  if config.services.sshd.enable
+  then "foo ${toString config.services.sshd.port} ${toString config.services.httpd.port} ${config.hostName}"
+       + "${config.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z}"
+       + "${config.foo.a}"
+       + "${config.foo.b.c}"
+  else "bar"

data/nix/tests/lang/eval-okay-attrs4.exp

@@ -0,0 +1 @@
+[ true false true false false true false false ]

data/nix/tests/lang/eval-okay-attrs4.nix

@@ -0,0 +1,7 @@
+let
+
+  as = { x.y.z = 123; a.b.c = 456; };
+
+  bs = null;
+
+in [ (as ? x) (as ? y) (as ? x.y.z) (as ? x.y.z.a) (as ? x.y.a) (as ? a.b.c) (bs ? x) (bs ? x.y.z) ]

data/nix/tests/lang/eval-okay-attrs5.exp

@@ -0,0 +1 @@
+[ 123 "foo" 456 456 "foo" "xyzzy" "xyzzy" true ]

data/nix/tests/lang/eval-okay-attrs5.nix

@@ -0,0 +1,21 @@
+with import ./lib.nix;
+
+let
+
+  as = { x.y.z = 123; a.b.c = 456; };
+
+  bs = { f-o-o.bar = "foo"; };
+
+  or = x: y: x || y;
+
+in
+  [ as.x.y.z
+    as.foo or "foo"
+    as.x.y.bla or as.a.b.c
+    as.a.b.c or as.x.y.z
+    as.x.y.bla or bs.f-o-o.bar or "xyzzy"
+    as.x.y.bla or bs.bar.foo or "xyzzy"
+    (123).bla or null.foo or "xyzzy"
+    # Backwards compatibility test.
+    (fold or [] [true false false])
+  ]

data/nix/tests/lang/eval-okay-attrs6.exp

@@ -0,0 +1 @@
+{ __overrides = { bar = "qux"; }; bar = "qux"; foo = "bar"; }

data/nix/tests/lang/eval-okay-attrs6.nix

@@ -0,0 +1,4 @@
+rec {
+  "${"foo"}" = "bar";
+   __overrides = { bar = "qux"; };
+}

data/nix/tests/lang/eval-okay-autoargs.exp

@@ -0,0 +1 @@
+"xyzzy!xyzzy!foobar"

data/nix/tests/lang/eval-okay-autoargs.flags

@@ -0,0 +1 @@
+--arg lib import(lang/lib.nix) --argstr xyzzy xyzzy! -A result

data/nix/tests/lang/eval-okay-autoargs.nix

@@ -0,0 +1,15 @@
+let
+
+  foobar = "foobar";
+
+in
+
+{ xyzzy2 ? xyzzy # mutually recursive args
+, xyzzy ? "blaat" # will be overridden by --argstr
+, fb ? foobar
+, lib # will be set by --arg
+}:
+
+{
+  result = lib.concat [xyzzy xyzzy2 fb];
+}

data/nix/tests/lang/eval-okay-backslash-newline-1.exp

@@ -0,0 +1 @@
+"a\nb"

data/nix/tests/lang/eval-okay-backslash-newline-1.nix

@@ -0,0 +1,2 @@
+"a\
+b"

data/nix/tests/lang/eval-okay-backslash-newline-2.exp

@@ -0,0 +1 @@
+"a\nb"

data/nix/tests/lang/eval-okay-backslash-newline-2.nix

@@ -0,0 +1,2 @@
+''a''\
+b''

data/nix/tests/lang/eval-okay-builtins-add.exp

@@ -0,0 +1 @@
+[ 5 4 "int" "tt" "float" 4 ]

data/nix/tests/lang/eval-okay-builtins-add.nix

@@ -0,0 +1,8 @@
+[
+(builtins.add 2 3)
+(builtins.add 2 2)
+(builtins.typeOf (builtins.add 2  2))
+("t" + "t")
+(builtins.typeOf (builtins.add 2.0 2))
+(builtins.add 2.0 2)
+]

data/nix/tests/lang/eval-okay-builtins.exp

@@ -0,0 +1 @@
+/foo

data/nix/tests/lang/eval-okay-builtins.nix

@@ -0,0 +1,12 @@
+assert builtins ? currentSystem;
+assert !builtins ? __currentSystem;
+
+let {
+
+  x = if builtins ? dirOf then builtins.dirOf /foo/bar else "";
+
+  y = if builtins ? fnord then builtins.fnord "foo" else "";
+
+  body = x + y;
+
+}

data/nix/tests/lang/eval-okay-callable-attrs.exp

@@ -0,0 +1 @@
+true

data/nix/tests/lang/eval-okay-callable-attrs.nix

@@ -0,0 +1 @@
+({ __functor = self: x: self.foo && x; foo = false; } // { foo = true; }) true

data/nix/tests/lang/eval-okay-catattrs.exp

@@ -0,0 +1 @@
+[ 1 2 ]

data/nix/tests/lang/eval-okay-catattrs.nix

@@ -0,0 +1 @@
+builtins.catAttrs "a" [ { a = 1; } { b = 0; } { a = 2; } ]