fix(depotfmt): only exclude *imported* tvix tests

When we added the Nix language test suite in cl/6126, we excluded the
whole tvix tests folder from Nix formatting. This is unintentional, as
we probably want *our* tests to be formatted correctly.

Change-Id: I2b66d79e30fae17e75d5a1f8c44e279886091c5f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11154
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI

tools/depotfmt.nix

@@ -23,7 +23,7 @@ let
     command = "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"
     includes = [ "*.nix" ]
     excludes = [
-      "tvix/eval/src/tests/*",
+      "tvix/eval/src/tests/nix_tests/*",
     ]
 
     [formatter.rust]

tvix/eval/src/tests/tvix_tests/eval-okay-access-strange-identifier.nix

@@ -2,7 +2,8 @@ let
   # There is no syntax for accessing this identifier in an ordinary
   # way.
   "foo bar" = 42;
-in ({
+in
+({
   # but we *can* inherit it back out
   inherit "foo bar";
 })."foo bar"

tvix/eval/src/tests/tvix_tests/eval-okay-builtins-groupby-thunk.nix

@@ -1,4 +1,3 @@
-
 builtins.groupBy
   (v: v.x)
   [ (rec { y = x; x = "fred"; }) ]

tvix/eval/src/tests/tvix_tests/eval-okay-closure-self.nix

@@ -1,4 +1,5 @@
 let
   # self-recursive function should be able to close over itself
   f = n: if n <= 0 then "done" else f (n - 1);
-in f 10
+in
+f 10

tvix/eval/src/tests/tvix_tests/eval-okay-concatstringssep.nix

@@ -1,6 +1,7 @@
 with builtins;
 
-[ (concatStringsSep "" [])
+[
+  (concatStringsSep "" [ ])
   (concatStringsSep "" [ "foo" "bar" "xyzzy" ])
   (concatStringsSep ", " [ "foo" "bar" "xyzzy" ])
   (concatStringsSep ", " [ "foo" ])

tvix/eval/src/tests/tvix_tests/eval-okay-deeply-nested-with-closure.nix

@@ -15,4 +15,7 @@ with { c = 3; d = 3; };
 _:
 with { d = 4; };
 
-[ a b c d ]) null null null null
+[ a b c d ]) null
+  null
+  null
+  null

tvix/eval/src/tests/tvix_tests/eval-okay-deferred-with.nix

@@ -5,4 +5,5 @@ let
   set = {
     value = 42;
   };
-in result
+in
+result

tvix/eval/src/tests/tvix_tests/eval-okay-fib.nix

@@ -1,7 +1,9 @@
 let
-  fib' = i: n: m: if i == 0
+  fib' = i: n: m:
+    if i == 0
     then n
     else fib' (i - 1) m (n + m);
 
   fib = n: fib' n 1 1;
-in fib 10
+in
+fib 10

tvix/eval/src/tests/tvix_tests/eval-okay-fix.nix

@@ -1,6 +1,7 @@
 let
   fix = f: let x = f x; in x;
-in fix(self: {
+in
+fix (self: {
   a = 1;
   b = self.a + 20;
   c = self.b * 2;

tvix/eval/src/tests/tvix_tests/eval-okay-functionargs.nix

@@ -15,7 +15,8 @@ let
       { name = "mplayer-${stdenv.name}.${xorg.libXv.name}-${xorg.libX11.name}"; };
 
   makeOverridable = f: origArgs: f origArgs //
-    { override = newArgs:
+    {
+      override = newArgs:
         makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
     };
 
@@ -37,7 +38,8 @@ let
         mplayer = callPackage mplayerFun { stdenv = pkgs.stdenv2; enableFoo = false; };
         nix = callPackage nixFun { };
       };
-    in pkgs;
+    in
+    pkgs;
 
   libX11Fun = { stdenv, fetchurl }: { name = "libX11"; };
   libX11_2Fun = { stdenv, fetchurl }: { name = "libX11_2"; };
@@ -67,7 +69,8 @@ let
 
 in
 
-  [ pkgs.stdenv.name
+[
+  pkgs.stdenv.name
   pkgs.fetchurl.name
   pkgs.aterm.name
   pkgs2.aterm.name

tvix/eval/src/tests/tvix_tests/eval-okay-inherit-string-ident.nix

@@ -4,4 +4,5 @@ let
   set = {
     inherit ({ value = 42; }) "value";
   };
-in set.value
+in
+set.value

tvix/eval/src/tests/tvix_tests/eval-okay-late-binding-closure.nix

@@ -1,4 +1,5 @@
 let
   f = n: n + a;
   a = 2;
-in f 40
+in
+f 40

tvix/eval/src/tests/tvix_tests/eval-okay-late-binding.nix

@@ -1,4 +1,5 @@
 let
   a = b;
   b = 42;
-in a
+in
+a

tvix/eval/src/tests/tvix_tests/eval-okay-lazy-equality.nix

@@ -6,7 +6,8 @@ let
   list3 = [ (2 + 2) ];
   list4 = [ (2 + 2) ];
   list5 = [ (2 + 2) ];
-in [
+in
+[
   (attrs1 == attrs2)
   (list1 == list2)
   (list3 == list2)

tvix/eval/src/tests/tvix_tests/eval-okay-let-identifiers.nix

@@ -2,4 +2,5 @@ let
   a = 1;
   "b" = 2;
   ${"c"} = 3;
-in [ a b c ]
+in
+[ a b c ]

tvix/eval/src/tests/tvix_tests/eval-okay-let-inherit.nix

@@ -9,4 +9,5 @@ in
   };
   inherit (set) a;
   inherit (set2) b;
-  in a + b
+in
+a + b

tvix/eval/src/tests/tvix_tests/eval-okay-let-sibling-access.nix

@@ -2,4 +2,5 @@ let
   a = 1;
   b = 2;
   c = a + b;
-in c
+in
+c

tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.nix

@@ -12,4 +12,5 @@ let
   b = builtins.listToAttrs (list ++ list);
   r = builtins.listToAttrs [ (asi "result" [ a b ]) (asi "throw" (throw "this should not be thrown")) ];
   x = builtins.listToAttrs [ (asi "foo" "bar") (asi "foo" "bla") ];
-in concat (map (x: x.a) r.result) + x.foo
+in
+concat (map (x: x.a) r.result) + x.foo

tvix/eval/src/tests/tvix_tests/eval-okay-manual-rec.nix

@@ -6,4 +6,5 @@ let
     a = 21;
     b = a * 2;
   };
-in set.b
+in
+set.b

tvix/eval/src/tests/tvix_tests/eval-okay-nested-deferred-upvalue.nix

@@ -1,6 +1,10 @@
 let
   doubler = n: outer n;
-  outer = let inner = n: a * n;
+  outer =
+    let
+      inner = n: a * n;
       a = 2;
-          in inner;
+    in
-in doubler 10
+    inner;
+in
+doubler 10

tvix/eval/src/tests/tvix_tests/eval-okay-nested-keys-let.nix

@@ -1,4 +1,5 @@
 let
   inner = 21;
   set.a.b = inner * 2;
-in set
+in
+set

tvix/eval/src/tests/tvix_tests/eval-okay-nested-let-slots.nix

@@ -6,12 +6,17 @@
 let
   a = 1;
   b = 2;
-  outer = let
+  outer =
+    let
       c = 3;
       d = 4;
-    inner = let
+      inner =
+        let
           e = 5;
           f = 6;
-    in g: [ a b c d e f g ];
+        in
-  in inner;
+        g: [ a b c d e f g ];
-in outer 7
+    in
+    inner;
+in
+outer 7

tvix/eval/src/tests/tvix_tests/eval-okay-nested-let.nix

@@ -1,7 +1,10 @@
 let
-  a = let
+  a =
+    let
       b = 1;
       c = 2;
-  in b + c;
+    in
+    b + c;
   b = 4;
-in a + b
+in
+a + b

tvix/eval/src/tests/tvix_tests/eval-okay-nested-poisoning.nix

@@ -1,4 +1,5 @@
 let
   null = 1;
   f = n: n + null;
-in f 41
+in
+f 41

tvix/eval/src/tests/tvix_tests/eval-okay-nested-thunks.nix

@@ -4,4 +4,5 @@ let
   a = b;
   b = c;
   c = 42;
-in a
+in
+a

tvix/eval/src/tests/tvix_tests/eval-okay-nested-with.nix

@@ -1,4 +1,5 @@
 let
   set1 = { a = 1; };
   set2 = { a = 2; };
-in with set1; with set2; a
+in
+with set1; with set2; a

tvix/eval/src/tests/tvix_tests/eval-okay-parsedrvname.nix

@@ -1,4 +1,3 @@
-
 # the first dash followed by a non-alphabetic character separates
 # the "name" from the "version"
 

tvix/eval/src/tests/tvix_tests/eval-okay-repeated-list-to-attrs.nix

@@ -7,7 +7,8 @@ let
 
   # foldl-based version of listToAttrs with the _opposite_ behaviour.
   listToAttrs' = list: foldl' (acc: elem: acc // { ${elem.name} = elem.value; }) { } list;
-in [
+in
+[
   (listToAttrs input).result
   (listToAttrs' input).result
 ]

tvix/eval/src/tests/tvix_tests/eval-okay-simple-let.nix

@@ -1,4 +1,5 @@
 let
   a = 1;
   b = 2;
-in a + b
+in
+a + b

tvix/eval/src/tests/tvix_tests/eval-okay-simple-with.nix

@@ -2,4 +2,5 @@ let
   set = {
     a = 1;
   };
-in with set; a
+in
+with set; a

tvix/eval/src/tests/tvix_tests/eval-okay-thunked-functor.nix

@@ -1,7 +1,8 @@
 let
   __functor = f;
   f = self: x: self.out * x;
-in {
+in
+{
   inherit __functor;
   out = 21;
 } 2

tvix/eval/src/tests/tvix_tests/eval-okay-thunked-if.nix

@@ -1,6 +1,8 @@
 let
   a = { };
-in let
+in
+let
   c = if builtins.isFunction a then a b else a;
   b = { };
-in c
+in
+c

tvix/eval/src/tests/tvix_tests/eval-okay-thunked-with.nix

@@ -4,4 +4,5 @@ let
   set = {
     a = with { b = 42; }; b;
   };
-in set.a
+in
+set.a

tvix/eval/src/tests/tvix_tests/eval-okay-toplevel-finaliser.nix

@@ -5,6 +5,7 @@ let
   a = 1;
   b = 2;
   c = 3;
-in {
+in
+{
   inherit a b c;
 }

tvix/eval/src/tests/tvix_tests/eval-okay-unpoison-scope.nix

@@ -1,7 +1,10 @@
 let
-  poisoned = let
+  poisoned =
+    let
       true = 1;
       false = 2;
       null = 3;
-  in [ true false null ];
+    in
-in [ true false null ] ++ poisoned
+    [ true false null ];
+in
+[ true false null ] ++ poisoned

tvix/eval/src/tests/tvix_tests/eval-okay-useless-inherit-with.nix

@@ -9,7 +9,8 @@ with ({ x = 1;});
 let inherit x;
 
   # Provide another dynamic `x` identifier
-in with ({ x = 3; });
+in
+with ({ x = 3; });
 
 # Inherited static identifier should have precedence
 x

tvix/eval/src/tests/tvix_tests/eval-okay-with-in-dynamic-key.nix

@@ -9,4 +9,5 @@ let
     ${with set1; key} = 20;
     ${with { key = "c"; }; key} = 2;
   };
-in set2.a + set2.b + set2.c
+in
+set2.a + set2.b + set2.c

tvix/eval/src/tests/tvix_tests/eval-okay-with-in-list.nix

@@ -6,7 +6,8 @@ let
   set = {
     value = 2;
   };
-in [
+in
+[
   1
   (with set; value)
   3

tvix/eval/src/tests/tvix_tests/lib.nix

@@ -20,9 +20,11 @@ rec {
   sum = foldl' (x: y: add x y) 0;
 
   hasSuffix = ext: fileName:
-    let lenFileName = stringLength fileName;
+    let
+      lenFileName = stringLength fileName;
       lenExt = stringLength ext;
-    in !(lessThan lenFileName lenExt) &&
+    in
+    !(lessThan lenFileName lenExt) &&
     substring (sub lenFileName lenExt) lenFileName fileName == ext;
 
   # Split a list at the given position.
@@ -40,7 +42,8 @@ rec {
         split = splitAt (div (length list) 2) list;
         first = sortBy comp split.first;
         second = sortBy comp split.second;
-      in mergeLists comp first second
+      in
+      mergeLists comp first second
     else list;
 
   mergeLists = comp: list1: list2:

tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-minimal-2.3-builtins.nix

@@ -10,23 +10,110 @@
 let
   # C++ Nix 2.3 builtins except valueSize which is removed in later versions
   minimalBuiltins = [
-    "abort" "add" "addErrorContext" "all" "any" "appendContext" "attrNames"
+    "abort"
-    "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "builtins" "catAttrs"
+    "add"
-    "compareVersions" "concatLists" "concatMap" "concatStringsSep"
+    "addErrorContext"
-    "currentSystem" "currentTime" "deepSeq" "derivation" "derivationStrict"
+    "all"
-    "dirOf" "div" "elem" "elemAt" "false" "fetchGit" "fetchMercurial"
+    "any"
-    "fetchTarball" "fetchurl" "filter" "filterSource" "findFile" "foldl'"
+    "appendContext"
-    "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr"
+    "attrNames"
-    "getContext" "getEnv" "hasAttr" "hasContext" "hashFile" "hashString" "head"
+    "attrValues"
-    "import" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt"
+    "baseNameOf"
-    "isList" "isNull" "isPath" "isString" "langVersion" "length" "lessThan"
+    "bitAnd"
-    "listToAttrs" "map" "mapAttrs" "match" "mul" "nixPath" "nixVersion" "null"
+    "bitOr"
-    "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir"
+    "bitXor"
-    "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort"
+    "builtins"
-    "split" "splitVersion" "storeDir" "storePath" "stringLength" "sub"
+    "catAttrs"
-    "substring" "tail" "throw" "toFile" "toJSON" "toPath" "toString" "toXML"
+    "compareVersions"
-    "trace" "true" "tryEval" "typeOf" "unsafeDiscardOutputDependency"
+    "concatLists"
-    "unsafeDiscardStringContext" "unsafeGetAttrPos"
+    "concatMap"
+    "concatStringsSep"
+    "currentSystem"
+    "currentTime"
+    "deepSeq"
+    "derivation"
+    "derivationStrict"
+    "dirOf"
+    "div"
+    "elem"
+    "elemAt"
+    "false"
+    "fetchGit"
+    "fetchMercurial"
+    "fetchTarball"
+    "fetchurl"
+    "filter"
+    "filterSource"
+    "findFile"
+    "foldl'"
+    "fromJSON"
+    "fromTOML"
+    "functionArgs"
+    "genList"
+    "genericClosure"
+    "getAttr"
+    "getContext"
+    "getEnv"
+    "hasAttr"
+    "hasContext"
+    "hashFile"
+    "hashString"
+    "head"
+    "import"
+    "intersectAttrs"
+    "isAttrs"
+    "isBool"
+    "isFloat"
+    "isFunction"
+    "isInt"
+    "isList"
+    "isNull"
+    "isPath"
+    "isString"
+    "langVersion"
+    "length"
+    "lessThan"
+    "listToAttrs"
+    "map"
+    "mapAttrs"
+    "match"
+    "mul"
+    "nixPath"
+    "nixVersion"
+    "null"
+    "parseDrvName"
+    "partition"
+    "path"
+    "pathExists"
+    "placeholder"
+    "readDir"
+    "readFile"
+    "removeAttrs"
+    "replaceStrings"
+    "scopedImport"
+    "seq"
+    "sort"
+    "split"
+    "splitVersion"
+    "storeDir"
+    "storePath"
+    "stringLength"
+    "sub"
+    "substring"
+    "tail"
+    "throw"
+    "toFile"
+    "toJSON"
+    "toPath"
+    "toString"
+    "toXML"
+    "trace"
+    "true"
+    "tryEval"
+    "typeOf"
+    "unsafeDiscardOutputDependency"
+    "unsafeDiscardStringContext"
+    "unsafeGetAttrPos"
   ];
 
   intersectLists = as: bs: builtins.filter (a: builtins.elem a bs) as;