diff options
Diffstat (limited to 'tests/lang')
349 files changed, 0 insertions, 3270 deletions
diff --git a/tests/lang/binary-data b/tests/lang/binary-data Binary files differdeleted file mode 100644 index 06d740502..000000000 --- a/tests/lang/binary-data +++ /dev/null diff --git a/tests/lang/data b/tests/lang/data deleted file mode 100644 index 257cc5642..000000000 --- a/tests/lang/data +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/lang/dir1/a.nix b/tests/lang/dir1/a.nix deleted file mode 100644 index 231f150c5..000000000 --- a/tests/lang/dir1/a.nix +++ /dev/null @@ -1 +0,0 @@ -"a" diff --git a/tests/lang/dir2/a.nix b/tests/lang/dir2/a.nix deleted file mode 100644 index 170df520a..000000000 --- a/tests/lang/dir2/a.nix +++ /dev/null @@ -1 +0,0 @@ -"X" diff --git a/tests/lang/dir2/b.nix b/tests/lang/dir2/b.nix deleted file mode 100644 index 19010cc35..000000000 --- a/tests/lang/dir2/b.nix +++ /dev/null @@ -1 +0,0 @@ -"b" diff --git a/tests/lang/dir3/a.nix b/tests/lang/dir3/a.nix deleted file mode 100644 index 170df520a..000000000 --- a/tests/lang/dir3/a.nix +++ /dev/null @@ -1 +0,0 @@ -"X" diff --git a/tests/lang/dir3/b.nix b/tests/lang/dir3/b.nix deleted file mode 100644 index 170df520a..000000000 --- a/tests/lang/dir3/b.nix +++ /dev/null @@ -1 +0,0 @@ -"X" diff --git a/tests/lang/dir3/c.nix b/tests/lang/dir3/c.nix deleted file mode 100644 index cdf158597..000000000 --- a/tests/lang/dir3/c.nix +++ /dev/null @@ -1 +0,0 @@ -"c" diff --git a/tests/lang/dir4/a.nix b/tests/lang/dir4/a.nix deleted file mode 100644 index 170df520a..000000000 --- a/tests/lang/dir4/a.nix +++ /dev/null @@ -1 +0,0 @@ -"X" diff --git a/tests/lang/dir4/c.nix b/tests/lang/dir4/c.nix deleted file mode 100644 index 170df520a..000000000 --- a/tests/lang/dir4/c.nix +++ /dev/null @@ -1 +0,0 @@ -"X" diff --git a/tests/lang/empty.exp b/tests/lang/empty.exp deleted file mode 100644 index e69de29bb..000000000 --- a/tests/lang/empty.exp +++ /dev/null diff --git a/tests/lang/eval-fail-abort.err.exp b/tests/lang/eval-fail-abort.err.exp deleted file mode 100644 index 345232d3f..000000000 --- a/tests/lang/eval-fail-abort.err.exp +++ /dev/null @@ -1,10 +0,0 @@ -error: - … while calling the 'abort' builtin - - at /pwd/lang/eval-fail-abort.nix:1:14: - - 1| if true then abort "this should fail" else 1 - | ^ - 2| - - error: evaluation aborted with the following error message: 'this should fail' diff --git a/tests/lang/eval-fail-abort.nix b/tests/lang/eval-fail-abort.nix deleted file mode 100644 index 75c51bceb..000000000 --- a/tests/lang/eval-fail-abort.nix +++ /dev/null @@ -1 +0,0 @@ -if true then abort "this should fail" else 1 diff --git a/tests/lang/eval-fail-antiquoted-path.err.exp b/tests/lang/eval-fail-antiquoted-path.err.exp deleted file mode 100644 index 425deba42..000000000 --- a/tests/lang/eval-fail-antiquoted-path.err.exp +++ /dev/null @@ -1 +0,0 @@ -error: getting attributes of path ‘PWD/lang/fnord’: No such file or directory diff --git a/tests/lang/eval-fail-assert.err.exp b/tests/lang/eval-fail-assert.err.exp deleted file mode 100644 index aeecd8167..000000000 --- a/tests/lang/eval-fail-assert.err.exp +++ /dev/null @@ -1,36 +0,0 @@ -error: - … while evaluating the attribute 'body' - - at /pwd/lang/eval-fail-assert.nix:4:3: - - 3| - 4| body = x "x"; - | ^ - 5| } - - … from call site - - at /pwd/lang/eval-fail-assert.nix:4:10: - - 3| - 4| body = x "x"; - | ^ - 5| } - - … while calling 'x' - - at /pwd/lang/eval-fail-assert.nix:2:7: - - 1| let { - 2| x = arg: assert arg == "y"; 123; - | ^ - 3| - - error: assertion '(arg == "y")' failed - - at /pwd/lang/eval-fail-assert.nix:2:12: - - 1| let { - 2| x = arg: assert arg == "y"; 123; - | ^ - 3| diff --git a/tests/lang/eval-fail-assert.nix b/tests/lang/eval-fail-assert.nix deleted file mode 100644 index 3b7a1e8bf..000000000 --- a/tests/lang/eval-fail-assert.nix +++ /dev/null @@ -1,5 +0,0 @@ -let { - x = arg: assert arg == "y"; 123; - - body = x "x"; -}
\ No newline at end of file diff --git a/tests/lang/eval-fail-bad-antiquote-1.err.exp b/tests/lang/eval-fail-bad-antiquote-1.err.exp deleted file mode 100644 index cf94f53bc..000000000 --- a/tests/lang/eval-fail-bad-antiquote-1.err.exp +++ /dev/null @@ -1,10 +0,0 @@ -error: - … while evaluating a path segment - - at /pwd/lang/eval-fail-bad-antiquote-1.nix:1:2: - - 1| "${x: x}" - | ^ - 2| - - error: cannot coerce a function to a string diff --git a/tests/lang/eval-fail-bad-antiquote-2.err.exp b/tests/lang/eval-fail-bad-antiquote-2.err.exp deleted file mode 100644 index c8fe39d12..000000000 --- a/tests/lang/eval-fail-bad-antiquote-2.err.exp +++ /dev/null @@ -1 +0,0 @@ -error: operation 'addToStoreFromDump' is not supported by store 'dummy' diff --git a/tests/lang/eval-fail-bad-antiquote-3.err.exp b/tests/lang/eval-fail-bad-antiquote-3.err.exp deleted file mode 100644 index fbefbc826..000000000 --- a/tests/lang/eval-fail-bad-antiquote-3.err.exp +++ /dev/null @@ -1,10 +0,0 @@ -error: - … while evaluating a path segment - - at /pwd/lang/eval-fail-bad-antiquote-3.nix:1:3: - - 1| ''${x: x}'' - | ^ - 2| - - error: cannot coerce a function to a string diff --git a/tests/lang/eval-fail-bad-string-interpolation-1.err.exp b/tests/lang/eval-fail-bad-string-interpolation-1.err.exp deleted file mode 100644 index eb73e9a52..000000000 --- a/tests/lang/eval-fail-bad-string-interpolation-1.err.exp +++ /dev/null @@ -1,10 +0,0 @@ -error: - … while evaluating a path segment - - at /pwd/lang/eval-fail-bad-string-interpolation-1.nix:1:2: - - 1| "${x: x}" - | ^ - 2| - - error: cannot coerce a function to a string diff --git a/tests/lang/eval-fail-bad-string-interpolation-1.nix b/tests/lang/eval-fail-bad-string-interpolation-1.nix deleted file mode 100644 index ffe9c983c..000000000 --- a/tests/lang/eval-fail-bad-string-interpolation-1.nix +++ /dev/null @@ -1 +0,0 @@ -"${x: x}" diff --git a/tests/lang/eval-fail-bad-string-interpolation-2.err.exp b/tests/lang/eval-fail-bad-string-interpolation-2.err.exp deleted file mode 100644 index c8fe39d12..000000000 --- a/tests/lang/eval-fail-bad-string-interpolation-2.err.exp +++ /dev/null @@ -1 +0,0 @@ -error: operation 'addToStoreFromDump' is not supported by store 'dummy' diff --git a/tests/lang/eval-fail-bad-string-interpolation-2.nix b/tests/lang/eval-fail-bad-string-interpolation-2.nix deleted file mode 100644 index 3745235ce..000000000 --- a/tests/lang/eval-fail-bad-string-interpolation-2.nix +++ /dev/null @@ -1 +0,0 @@ -"${./fnord}" diff --git a/tests/lang/eval-fail-bad-string-interpolation-3.err.exp b/tests/lang/eval-fail-bad-string-interpolation-3.err.exp deleted file mode 100644 index ac14f329b..000000000 --- a/tests/lang/eval-fail-bad-string-interpolation-3.err.exp +++ /dev/null @@ -1,10 +0,0 @@ -error: - … while evaluating a path segment - - at /pwd/lang/eval-fail-bad-string-interpolation-3.nix:1:3: - - 1| ''${x: x}'' - | ^ - 2| - - error: cannot coerce a function to a string diff --git a/tests/lang/eval-fail-bad-string-interpolation-3.nix b/tests/lang/eval-fail-bad-string-interpolation-3.nix deleted file mode 100644 index 65b9d4f50..000000000 --- a/tests/lang/eval-fail-bad-string-interpolation-3.nix +++ /dev/null @@ -1 +0,0 @@ -''${x: x}'' diff --git a/tests/lang/eval-fail-blackhole.err.exp b/tests/lang/eval-fail-blackhole.err.exp deleted file mode 100644 index f0618d8ac..000000000 --- a/tests/lang/eval-fail-blackhole.err.exp +++ /dev/null @@ -1,18 +0,0 @@ -error: - … while evaluating the attribute 'body' - - at /pwd/lang/eval-fail-blackhole.nix:2:3: - - 1| let { - 2| body = x; - | ^ - 3| x = y; - - error: infinite recursion encountered - - at /pwd/lang/eval-fail-blackhole.nix:3:7: - - 2| body = x; - 3| x = y; - | ^ - 4| y = x; diff --git a/tests/lang/eval-fail-blackhole.nix b/tests/lang/eval-fail-blackhole.nix deleted file mode 100644 index 81133b511..000000000 --- a/tests/lang/eval-fail-blackhole.nix +++ /dev/null @@ -1,5 +0,0 @@ -let { - body = x; - x = y; - y = x; -} diff --git a/tests/lang/eval-fail-deepseq.err.exp b/tests/lang/eval-fail-deepseq.err.exp deleted file mode 100644 index 5e204ba73..000000000 --- a/tests/lang/eval-fail-deepseq.err.exp +++ /dev/null @@ -1,26 +0,0 @@ -error: - … while calling the 'deepSeq' builtin - - at /pwd/lang/eval-fail-deepseq.nix:1:1: - - 1| builtins.deepSeq { x = abort "foo"; } 456 - | ^ - 2| - - … while evaluating the attribute 'x' - - at /pwd/lang/eval-fail-deepseq.nix:1:20: - - 1| builtins.deepSeq { x = abort "foo"; } 456 - | ^ - 2| - - … while calling the 'abort' builtin - - at /pwd/lang/eval-fail-deepseq.nix:1:24: - - 1| builtins.deepSeq { x = abort "foo"; } 456 - | ^ - 2| - - error: evaluation aborted with the following error message: 'foo' diff --git a/tests/lang/eval-fail-deepseq.nix b/tests/lang/eval-fail-deepseq.nix deleted file mode 100644 index 9baa49b06..000000000 --- a/tests/lang/eval-fail-deepseq.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.deepSeq { x = abort "foo"; } 456 diff --git a/tests/lang/eval-fail-dup-dynamic-attrs.err.exp b/tests/lang/eval-fail-dup-dynamic-attrs.err.exp deleted file mode 100644 index e01f8e6d0..000000000 --- a/tests/lang/eval-fail-dup-dynamic-attrs.err.exp +++ /dev/null @@ -1,8 +0,0 @@ -error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:11 - - at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:11: - - 2| set = { "${"" + "b"}" = 1; }; - 3| set = { "${"b" + ""}" = 2; }; - | ^ - 4| } diff --git a/tests/lang/eval-fail-dup-dynamic-attrs.nix b/tests/lang/eval-fail-dup-dynamic-attrs.nix deleted file mode 100644 index 7ea17f6c8..000000000 --- a/tests/lang/eval-fail-dup-dynamic-attrs.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - set = { "${"" + "b"}" = 1; }; - set = { "${"b" + ""}" = 2; }; -} diff --git a/tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp b/tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp deleted file mode 100644 index 0069285fb..000000000 --- a/tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp +++ /dev/null @@ -1,38 +0,0 @@ -error: - … while calling the 'foldl'' builtin - - at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:2:1: - - 1| # Tests that the result of applying op is forced even if the value is never used - 2| builtins.foldl' - | ^ - 3| (_: f: f null) - - … while calling anonymous lambda - - at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:3:7: - - 2| builtins.foldl' - 3| (_: f: f null) - | ^ - 4| null - - … from call site - - at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:3:10: - - 2| builtins.foldl' - 3| (_: f: f null) - | ^ - 4| null - - … while calling anonymous lambda - - at /pwd/lang/eval-fail-foldlStrict-strict-op-application.nix:5:6: - - 4| null - 5| [ (_: throw "Not the final value, but is still forced!") (_: 23) ] - | ^ - 6| - - error: Not the final value, but is still forced! diff --git a/tests/lang/eval-fail-foldlStrict-strict-op-application.nix b/tests/lang/eval-fail-foldlStrict-strict-op-application.nix deleted file mode 100644 index 1620cc76e..000000000 --- a/tests/lang/eval-fail-foldlStrict-strict-op-application.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Tests that the result of applying op is forced even if the value is never used -builtins.foldl' - (_: f: f null) - null - [ (_: throw "Not the final value, but is still forced!") (_: 23) ] diff --git a/tests/lang/eval-fail-fromTOML-timestamps.err.exp b/tests/lang/eval-fail-fromTOML-timestamps.err.exp deleted file mode 100644 index f6bd19f5a..000000000 --- a/tests/lang/eval-fail-fromTOML-timestamps.err.exp +++ /dev/null @@ -1,12 +0,0 @@ -error: - … while calling the 'fromTOML' builtin - - at /pwd/lang/eval-fail-fromTOML-timestamps.nix:1:1: - - 1| builtins.fromTOML '' - | ^ - 2| key = "value" - - error: while parsing a TOML string: Dates and times are not supported - - at «none»:0: (source not available) diff --git a/tests/lang/eval-fail-fromTOML-timestamps.nix b/tests/lang/eval-fail-fromTOML-timestamps.nix deleted file mode 100644 index 74cff9470..000000000 --- a/tests/lang/eval-fail-fromTOML-timestamps.nix +++ /dev/null @@ -1,130 +0,0 @@ -builtins.fromTOML '' - key = "value" - bare_key = "value" - bare-key = "value" - 1234 = "value" - - "127.0.0.1" = "value" - "character encoding" = "value" - "ʎǝʞ" = "value" - 'key2' = "value" - 'quoted "value"' = "value" - - name = "Orange" - - physical.color = "orange" - physical.shape = "round" - site."google.com" = true - - # This is legal according to the spec, but cpptoml doesn't handle it. - #a.b.c = 1 - #a.d = 2 - - str = "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF." - - int1 = +99 - int2 = 42 - int3 = 0 - int4 = -17 - int5 = 1_000 - int6 = 5_349_221 - int7 = 1_2_3_4_5 - - hex1 = 0xDEADBEEF - hex2 = 0xdeadbeef - hex3 = 0xdead_beef - - oct1 = 0o01234567 - oct2 = 0o755 - - bin1 = 0b11010110 - - flt1 = +1.0 - flt2 = 3.1415 - flt3 = -0.01 - flt4 = 5e+22 - flt5 = 1e6 - flt6 = -2E-2 - flt7 = 6.626e-34 - flt8 = 9_224_617.445_991_228_313 - - bool1 = true - bool2 = false - - odt1 = 1979-05-27T07:32:00Z - odt2 = 1979-05-27T00:32:00-07:00 - odt3 = 1979-05-27T00:32:00.999999-07:00 - odt4 = 1979-05-27 07:32:00Z - ldt1 = 1979-05-27T07:32:00 - ldt2 = 1979-05-27T00:32:00.999999 - ld1 = 1979-05-27 - lt1 = 07:32:00 - lt2 = 00:32:00.999999 - - arr1 = [ 1, 2, 3 ] - arr2 = [ "red", "yellow", "green" ] - arr3 = [ [ 1, 2 ], [3, 4, 5] ] - arr4 = [ "all", 'strings', """are the same""", ''''type''''] - arr5 = [ [ 1, 2 ], ["a", "b", "c"] ] - - arr7 = [ - 1, 2, 3 - ] - - arr8 = [ - 1, - 2, # this is ok - ] - - [table-1] - key1 = "some string" - key2 = 123 - - - [table-2] - key1 = "another string" - key2 = 456 - - [dog."tater.man"] - type.name = "pug" - - [a.b.c] - [ d.e.f ] - [ g . h . i ] - [ j . "ʞ" . 'l' ] - [x.y.z.w] - - name = { first = "Tom", last = "Preston-Werner" } - point = { x = 1, y = 2 } - animal = { type.name = "pug" } - - [[products]] - name = "Hammer" - sku = 738594937 - - [[products]] - - [[products]] - name = "Nail" - sku = 284758393 - color = "gray" - - [[fruit]] - name = "apple" - - [fruit.physical] - color = "red" - shape = "round" - - [[fruit.variety]] - name = "red delicious" - - [[fruit.variety]] - name = "granny smith" - - [[fruit]] - name = "banana" - - [[fruit.variety]] - name = "plantain" -'' diff --git a/tests/lang/eval-fail-hashfile-missing.err.exp b/tests/lang/eval-fail-hashfile-missing.err.exp deleted file mode 100644 index 8e77dec1e..000000000 --- a/tests/lang/eval-fail-hashfile-missing.err.exp +++ /dev/null @@ -1,19 +0,0 @@ -error: - … while calling the 'toString' builtin - - at /pwd/lang/eval-fail-hashfile-missing.nix:4:3: - - 3| in - 4| toString (builtins.concatLists (map (hash: map (builtins.hashFile hash) paths) ["md5" "sha1" "sha256" "sha512"])) - | ^ - 5| - - … while evaluating the first argument passed to builtins.toString - - at «none»:0: (source not available) - - … while calling the 'hashFile' builtin - - at «none»:0: (source not available) - - error: opening file '/pwd/lang/this-file-is-definitely-not-there-7392097': No such file or directory diff --git a/tests/lang/eval-fail-hashfile-missing.nix b/tests/lang/eval-fail-hashfile-missing.nix deleted file mode 100644 index ce098b823..000000000 --- a/tests/lang/eval-fail-hashfile-missing.nix +++ /dev/null @@ -1,5 +0,0 @@ -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"])) - diff --git a/tests/lang/eval-fail-list.err.exp b/tests/lang/eval-fail-list.err.exp deleted file mode 100644 index 24d682118..000000000 --- a/tests/lang/eval-fail-list.err.exp +++ /dev/null @@ -1,10 +0,0 @@ -error: - … while evaluating one of the elements to concatenate - - at /pwd/lang/eval-fail-list.nix:1:2: - - 1| 8++1 - | ^ - 2| - - error: value is an integer while a list was expected diff --git a/tests/lang/eval-fail-list.nix b/tests/lang/eval-fail-list.nix deleted file mode 100644 index fa749f2f7..000000000 --- a/tests/lang/eval-fail-list.nix +++ /dev/null @@ -1 +0,0 @@ -8++1 diff --git a/tests/lang/eval-fail-missing-arg.err.exp b/tests/lang/eval-fail-missing-arg.err.exp deleted file mode 100644 index 61fabf0d5..000000000 --- a/tests/lang/eval-fail-missing-arg.err.exp +++ /dev/null @@ -1,16 +0,0 @@ -error: - … from call site - - at /pwd/lang/eval-fail-missing-arg.nix:1:1: - - 1| ({x, y, z}: x + y + z) {x = "foo"; z = "bar";} - | ^ - 2| - - error: function 'anonymous lambda' called without required argument 'y' - - at /pwd/lang/eval-fail-missing-arg.nix:1:2: - - 1| ({x, y, z}: x + y + z) {x = "foo"; z = "bar";} - | ^ - 2| diff --git a/tests/lang/eval-fail-missing-arg.nix b/tests/lang/eval-fail-missing-arg.nix deleted file mode 100644 index c4be9797c..000000000 --- a/tests/lang/eval-fail-missing-arg.nix +++ /dev/null @@ -1 +0,0 @@ -({x, y, z}: x + y + z) {x = "foo"; z = "bar";} diff --git a/tests/lang/eval-fail-nonexist-path.err.exp b/tests/lang/eval-fail-nonexist-path.err.exp deleted file mode 100644 index c8fe39d12..000000000 --- a/tests/lang/eval-fail-nonexist-path.err.exp +++ /dev/null @@ -1 +0,0 @@ -error: operation 'addToStoreFromDump' is not supported by store 'dummy' diff --git a/tests/lang/eval-fail-nonexist-path.nix b/tests/lang/eval-fail-nonexist-path.nix deleted file mode 100644 index f2f08107b..000000000 --- a/tests/lang/eval-fail-nonexist-path.nix +++ /dev/null @@ -1,4 +0,0 @@ -# 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" diff --git a/tests/lang/eval-fail-path-slash.err.exp b/tests/lang/eval-fail-path-slash.err.exp deleted file mode 100644 index f0011c97f..000000000 --- a/tests/lang/eval-fail-path-slash.err.exp +++ /dev/null @@ -1,8 +0,0 @@ -error: path has a trailing slash - - at /pwd/lang/eval-fail-path-slash.nix:6:12: - - 5| # and https://nixos.org/nix-dev/2016-June/020829.html - 6| /nix/store/ - | ^ - 7| diff --git a/tests/lang/eval-fail-path-slash.nix b/tests/lang/eval-fail-path-slash.nix deleted file mode 100644 index 8c2e104c7..000000000 --- a/tests/lang/eval-fail-path-slash.nix +++ /dev/null @@ -1,6 +0,0 @@ -# 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/ diff --git a/tests/lang/eval-fail-recursion.err.exp b/tests/lang/eval-fail-recursion.err.exp deleted file mode 100644 index af64133cb..000000000 --- a/tests/lang/eval-fail-recursion.err.exp +++ /dev/null @@ -1,16 +0,0 @@ -error: - … in the right operand of the update (//) operator - - at /pwd/lang/eval-fail-recursion.nix:1:12: - - 1| let a = {} // a; in a.foo - | ^ - 2| - - error: infinite recursion encountered - - at /pwd/lang/eval-fail-recursion.nix:1:15: - - 1| let a = {} // a; in a.foo - | ^ - 2| diff --git a/tests/lang/eval-fail-recursion.nix b/tests/lang/eval-fail-recursion.nix deleted file mode 100644 index 075b5ed06..000000000 --- a/tests/lang/eval-fail-recursion.nix +++ /dev/null @@ -1 +0,0 @@ -let a = {} // a; in a.foo diff --git a/tests/lang/eval-fail-remove.err.exp b/tests/lang/eval-fail-remove.err.exp deleted file mode 100644 index e82cdac98..000000000 --- a/tests/lang/eval-fail-remove.err.exp +++ /dev/null @@ -1,19 +0,0 @@ -error: - … while evaluating the attribute 'body' - - at /pwd/lang/eval-fail-remove.nix:4:3: - - 3| - 4| body = (removeAttrs attrs ["x"]).x; - | ^ - 5| } - - error: attribute 'x' missing - - at /pwd/lang/eval-fail-remove.nix:4:10: - - 3| - 4| body = (removeAttrs attrs ["x"]).x; - | ^ - 5| } - Did you mean y? diff --git a/tests/lang/eval-fail-remove.nix b/tests/lang/eval-fail-remove.nix deleted file mode 100644 index 539e0eb0a..000000000 --- a/tests/lang/eval-fail-remove.nix +++ /dev/null @@ -1,5 +0,0 @@ -let { - attrs = {x = 123; y = 456;}; - - body = (removeAttrs attrs ["x"]).x; -}
\ No newline at end of file diff --git a/tests/lang/eval-fail-scope-5.err.exp b/tests/lang/eval-fail-scope-5.err.exp deleted file mode 100644 index 22b6166f8..000000000 --- a/tests/lang/eval-fail-scope-5.err.exp +++ /dev/null @@ -1,36 +0,0 @@ -error: - … while evaluating the attribute 'body' - - at /pwd/lang/eval-fail-scope-5.nix:8:3: - - 7| - 8| body = f {}; - | ^ - 9| - - … from call site - - at /pwd/lang/eval-fail-scope-5.nix:8:10: - - 7| - 8| body = f {}; - | ^ - 9| - - … while calling 'f' - - at /pwd/lang/eval-fail-scope-5.nix:6:7: - - 5| - 6| f = {x ? y, y ? x}: x + y; - | ^ - 7| - - error: infinite recursion encountered - - at /pwd/lang/eval-fail-scope-5.nix:6:12: - - 5| - 6| f = {x ? y, y ? x}: x + y; - | ^ - 7| diff --git a/tests/lang/eval-fail-scope-5.nix b/tests/lang/eval-fail-scope-5.nix deleted file mode 100644 index f89a65a99..000000000 --- a/tests/lang/eval-fail-scope-5.nix +++ /dev/null @@ -1,10 +0,0 @@ -let { - - x = "a"; - y = "b"; - - f = {x ? y, y ? x}: x + y; - - body = f {}; - -} diff --git a/tests/lang/eval-fail-seq.err.exp b/tests/lang/eval-fail-seq.err.exp deleted file mode 100644 index 33a7e9491..000000000 --- a/tests/lang/eval-fail-seq.err.exp +++ /dev/null @@ -1,18 +0,0 @@ -error: - … while calling the 'seq' builtin - - at /pwd/lang/eval-fail-seq.nix:1:1: - - 1| builtins.seq (abort "foo") 2 - | ^ - 2| - - … while calling the 'abort' builtin - - at /pwd/lang/eval-fail-seq.nix:1:15: - - 1| builtins.seq (abort "foo") 2 - | ^ - 2| - - error: evaluation aborted with the following error message: 'foo' diff --git a/tests/lang/eval-fail-seq.nix b/tests/lang/eval-fail-seq.nix deleted file mode 100644 index cddbbfd32..000000000 --- a/tests/lang/eval-fail-seq.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.seq (abort "foo") 2 diff --git a/tests/lang/eval-fail-set-override.err.exp b/tests/lang/eval-fail-set-override.err.exp deleted file mode 100644 index beb29d678..000000000 --- a/tests/lang/eval-fail-set-override.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: - … while evaluating the `__overrides` attribute - - at «none»:0: (source not available) - - error: value is an integer while a set was expected diff --git a/tests/lang/eval-fail-set-override.nix b/tests/lang/eval-fail-set-override.nix deleted file mode 100644 index 03551c186..000000000 --- a/tests/lang/eval-fail-set-override.nix +++ /dev/null @@ -1 +0,0 @@ -rec { __overrides = 1; } diff --git a/tests/lang/eval-fail-set.err.exp b/tests/lang/eval-fail-set.err.exp deleted file mode 100644 index 0d0140508..000000000 --- a/tests/lang/eval-fail-set.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: undefined variable 'x' - - at /pwd/lang/eval-fail-set.nix:1:3: - - 1| 8.x - | ^ - 2| diff --git a/tests/lang/eval-fail-set.nix b/tests/lang/eval-fail-set.nix deleted file mode 100644 index c6b7980b6..000000000 --- a/tests/lang/eval-fail-set.nix +++ /dev/null @@ -1 +0,0 @@ -8.x diff --git a/tests/lang/eval-fail-substring.err.exp b/tests/lang/eval-fail-substring.err.exp deleted file mode 100644 index dc26a00bd..000000000 --- a/tests/lang/eval-fail-substring.err.exp +++ /dev/null @@ -1,12 +0,0 @@ -error: - … while calling the 'substring' builtin - - at /pwd/lang/eval-fail-substring.nix:1:1: - - 1| builtins.substring (builtins.sub 0 1) 1 "x" - | ^ - 2| - - error: negative start position in 'substring' - - at «none»:0: (source not available) diff --git a/tests/lang/eval-fail-substring.nix b/tests/lang/eval-fail-substring.nix deleted file mode 100644 index f37c2bc0a..000000000 --- a/tests/lang/eval-fail-substring.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.substring (builtins.sub 0 1) 1 "x" diff --git a/tests/lang/eval-fail-to-path.err.exp b/tests/lang/eval-fail-to-path.err.exp deleted file mode 100644 index 43ed2bdfc..000000000 --- a/tests/lang/eval-fail-to-path.err.exp +++ /dev/null @@ -1,14 +0,0 @@ -error: - … while calling the 'toPath' builtin - - at /pwd/lang/eval-fail-to-path.nix:1:1: - - 1| builtins.toPath "foo/bar" - | ^ - 2| - - … while evaluating the first argument passed to builtins.toPath - - at «none»:0: (source not available) - - error: string 'foo/bar' doesn't represent an absolute path diff --git a/tests/lang/eval-fail-to-path.nix b/tests/lang/eval-fail-to-path.nix deleted file mode 100644 index 5e322bc31..000000000 --- a/tests/lang/eval-fail-to-path.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.toPath "foo/bar" diff --git a/tests/lang/eval-fail-toJSON.err.exp b/tests/lang/eval-fail-toJSON.err.exp deleted file mode 100644 index 4e618c203..000000000 --- a/tests/lang/eval-fail-toJSON.err.exp +++ /dev/null @@ -1,57 +0,0 @@ -error: - … while calling the 'toJSON' builtin - - at /pwd/lang/eval-fail-toJSON.nix:1:1: - - 1| builtins.toJSON { - | ^ - 2| a.b = [ - - … while evaluating attribute 'a' - - at /pwd/lang/eval-fail-toJSON.nix:2:3: - - 1| builtins.toJSON { - 2| a.b = [ - | ^ - 3| true - - … while evaluating attribute 'b' - - at /pwd/lang/eval-fail-toJSON.nix:2:3: - - 1| builtins.toJSON { - 2| a.b = [ - | ^ - 3| true - - … while evaluating list element at index 3 - - … while evaluating attribute 'c' - - at /pwd/lang/eval-fail-toJSON.nix:7:7: - - 6| { - 7| c.d = throw "hah no"; - | ^ - 8| } - - … while evaluating attribute 'd' - - at /pwd/lang/eval-fail-toJSON.nix:7:7: - - 6| { - 7| c.d = throw "hah no"; - | ^ - 8| } - - … while calling the 'throw' builtin - - at /pwd/lang/eval-fail-toJSON.nix:7:13: - - 6| { - 7| c.d = throw "hah no"; - | ^ - 8| } - - error: hah no diff --git a/tests/lang/eval-fail-toJSON.nix b/tests/lang/eval-fail-toJSON.nix deleted file mode 100644 index 8112e1c1f..000000000 --- a/tests/lang/eval-fail-toJSON.nix +++ /dev/null @@ -1,10 +0,0 @@ -builtins.toJSON { - a.b = [ - true - false - "it's a bird" - { - c.d = throw "hah no"; - } - ]; -} diff --git a/tests/lang/eval-fail-undeclared-arg.err.exp b/tests/lang/eval-fail-undeclared-arg.err.exp deleted file mode 100644 index 30db743c7..000000000 --- a/tests/lang/eval-fail-undeclared-arg.err.exp +++ /dev/null @@ -1,17 +0,0 @@ -error: - … from call site - - at /pwd/lang/eval-fail-undeclared-arg.nix:1:1: - - 1| ({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";} - | ^ - 2| - - error: function 'anonymous lambda' called with unexpected argument 'y' - - at /pwd/lang/eval-fail-undeclared-arg.nix:1:2: - - 1| ({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";} - | ^ - 2| - Did you mean one of x or z? diff --git a/tests/lang/eval-fail-undeclared-arg.nix b/tests/lang/eval-fail-undeclared-arg.nix deleted file mode 100644 index cafdf1636..000000000 --- a/tests/lang/eval-fail-undeclared-arg.nix +++ /dev/null @@ -1 +0,0 @@ -({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";} diff --git a/tests/lang/eval-okay-any-all.exp b/tests/lang/eval-okay-any-all.exp deleted file mode 100644 index eb273f45b..000000000 --- a/tests/lang/eval-okay-any-all.exp +++ /dev/null @@ -1 +0,0 @@ -[ false false true true true true false true ] diff --git a/tests/lang/eval-okay-any-all.nix b/tests/lang/eval-okay-any-all.nix deleted file mode 100644 index a3f26ea2a..000000000 --- a/tests/lang/eval-okay-any-all.nix +++ /dev/null @@ -1,11 +0,0 @@ -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]) -] diff --git a/tests/lang/eval-okay-arithmetic.exp b/tests/lang/eval-okay-arithmetic.exp deleted file mode 100644 index 5c54d10b7..000000000 --- a/tests/lang/eval-okay-arithmetic.exp +++ /dev/null @@ -1 +0,0 @@ -2216 diff --git a/tests/lang/eval-okay-arithmetic.nix b/tests/lang/eval-okay-arithmetic.nix deleted file mode 100644 index 7e9e6a0b6..000000000 --- a/tests/lang/eval-okay-arithmetic.nix +++ /dev/null @@ -1,59 +0,0 @@ -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) - ]; - -} diff --git a/tests/lang/eval-okay-attrnames.exp b/tests/lang/eval-okay-attrnames.exp deleted file mode 100644 index b4aa387e0..000000000 --- a/tests/lang/eval-okay-attrnames.exp +++ /dev/null @@ -1 +0,0 @@ -"newxfoonewxy" diff --git a/tests/lang/eval-okay-attrnames.nix b/tests/lang/eval-okay-attrnames.nix deleted file mode 100644 index e5b26e9f2..000000000 --- a/tests/lang/eval-okay-attrnames.nix +++ /dev/null @@ -1,11 +0,0 @@ -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 diff --git a/tests/lang/eval-okay-attrs.exp b/tests/lang/eval-okay-attrs.exp deleted file mode 100644 index 45b0f829e..000000000 --- a/tests/lang/eval-okay-attrs.exp +++ /dev/null @@ -1 +0,0 @@ -987 diff --git a/tests/lang/eval-okay-attrs.nix b/tests/lang/eval-okay-attrs.nix deleted file mode 100644 index 810b31a5d..000000000 --- a/tests/lang/eval-okay-attrs.nix +++ /dev/null @@ -1,5 +0,0 @@ -let { - as = { x = 123; y = 456; } // { z = 789; } // { z = 987; }; - - body = if as ? a then as.a else assert as ? z; as.z; -} diff --git a/tests/lang/eval-okay-attrs2.exp b/tests/lang/eval-okay-attrs2.exp deleted file mode 100644 index 45b0f829e..000000000 --- a/tests/lang/eval-okay-attrs2.exp +++ /dev/null @@ -1 +0,0 @@ -987 diff --git a/tests/lang/eval-okay-attrs2.nix b/tests/lang/eval-okay-attrs2.nix deleted file mode 100644 index 9e06b83ac..000000000 --- a/tests/lang/eval-okay-attrs2.nix +++ /dev/null @@ -1,10 +0,0 @@ -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; -} diff --git a/tests/lang/eval-okay-attrs3.exp b/tests/lang/eval-okay-attrs3.exp deleted file mode 100644 index 19de4fdf7..000000000 --- a/tests/lang/eval-okay-attrs3.exp +++ /dev/null @@ -1 +0,0 @@ -"foo 22 80 itchyxac" diff --git a/tests/lang/eval-okay-attrs3.nix b/tests/lang/eval-okay-attrs3.nix deleted file mode 100644 index f29de11fe..000000000 --- a/tests/lang/eval-okay-attrs3.nix +++ /dev/null @@ -1,22 +0,0 @@ -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" diff --git a/tests/lang/eval-okay-attrs4.exp b/tests/lang/eval-okay-attrs4.exp deleted file mode 100644 index 185173144..000000000 --- a/tests/lang/eval-okay-attrs4.exp +++ /dev/null @@ -1 +0,0 @@ -[ true false true false false true false false ] diff --git a/tests/lang/eval-okay-attrs4.nix b/tests/lang/eval-okay-attrs4.nix deleted file mode 100644 index 43ec81210..000000000 --- a/tests/lang/eval-okay-attrs4.nix +++ /dev/null @@ -1,7 +0,0 @@ -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) ] diff --git a/tests/lang/eval-okay-attrs5.exp b/tests/lang/eval-okay-attrs5.exp deleted file mode 100644 index ce0430d78..000000000 --- a/tests/lang/eval-okay-attrs5.exp +++ /dev/null @@ -1 +0,0 @@ -[ 123 "foo" 456 456 "foo" "xyzzy" "xyzzy" true ] diff --git a/tests/lang/eval-okay-attrs5.nix b/tests/lang/eval-okay-attrs5.nix deleted file mode 100644 index a4584cd3b..000000000 --- a/tests/lang/eval-okay-attrs5.nix +++ /dev/null @@ -1,21 +0,0 @@ -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]) - ] diff --git a/tests/lang/eval-okay-attrs6.exp b/tests/lang/eval-okay-attrs6.exp deleted file mode 100644 index b46938032..000000000 --- a/tests/lang/eval-okay-attrs6.exp +++ /dev/null @@ -1 +0,0 @@ -{ __overrides = { bar = "qux"; }; bar = "qux"; foo = "bar"; } diff --git a/tests/lang/eval-okay-attrs6.nix b/tests/lang/eval-okay-attrs6.nix deleted file mode 100644 index 2e5c85483..000000000 --- a/tests/lang/eval-okay-attrs6.nix +++ /dev/null @@ -1,4 +0,0 @@ -rec { - "${"foo"}" = "bar"; - __overrides = { bar = "qux"; }; -} diff --git a/tests/lang/eval-okay-autoargs.exp b/tests/lang/eval-okay-autoargs.exp deleted file mode 100644 index 7a8391786..000000000 --- a/tests/lang/eval-okay-autoargs.exp +++ /dev/null @@ -1 +0,0 @@ -"xyzzy!xyzzy!foobar" diff --git a/tests/lang/eval-okay-autoargs.flags b/tests/lang/eval-okay-autoargs.flags deleted file mode 100644 index ae3762254..000000000 --- a/tests/lang/eval-okay-autoargs.flags +++ /dev/null @@ -1 +0,0 @@ ---arg lib import(lang/lib.nix) --argstr xyzzy xyzzy! -A result diff --git a/tests/lang/eval-okay-autoargs.nix b/tests/lang/eval-okay-autoargs.nix deleted file mode 100644 index 815f51b1d..000000000 --- a/tests/lang/eval-okay-autoargs.nix +++ /dev/null @@ -1,15 +0,0 @@ -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]; -} diff --git a/tests/lang/eval-okay-backslash-newline-1.exp b/tests/lang/eval-okay-backslash-newline-1.exp deleted file mode 100644 index 3e754364c..000000000 --- a/tests/lang/eval-okay-backslash-newline-1.exp +++ /dev/null @@ -1 +0,0 @@ -"a\nb" diff --git a/tests/lang/eval-okay-backslash-newline-1.nix b/tests/lang/eval-okay-backslash-newline-1.nix deleted file mode 100644 index 7fef3dddd..000000000 --- a/tests/lang/eval-okay-backslash-newline-1.nix +++ /dev/null @@ -1,2 +0,0 @@ -"a\ -b" diff --git a/tests/lang/eval-okay-backslash-newline-2.exp b/tests/lang/eval-okay-backslash-newline-2.exp deleted file mode 100644 index 3e754364c..000000000 --- a/tests/lang/eval-okay-backslash-newline-2.exp +++ /dev/null @@ -1 +0,0 @@ -"a\nb" diff --git a/tests/lang/eval-okay-backslash-newline-2.nix b/tests/lang/eval-okay-backslash-newline-2.nix deleted file mode 100644 index 35ddf495c..000000000 --- a/tests/lang/eval-okay-backslash-newline-2.nix +++ /dev/null @@ -1,2 +0,0 @@ -''a''\ -b'' diff --git a/tests/lang/eval-okay-builtins-add.exp b/tests/lang/eval-okay-builtins-add.exp deleted file mode 100644 index 0350b518a..000000000 --- a/tests/lang/eval-okay-builtins-add.exp +++ /dev/null @@ -1 +0,0 @@ -[ 5 4 "int" "tt" "float" 4 ] diff --git a/tests/lang/eval-okay-builtins-add.nix b/tests/lang/eval-okay-builtins-add.nix deleted file mode 100644 index c84181622..000000000 --- a/tests/lang/eval-okay-builtins-add.nix +++ /dev/null @@ -1,8 +0,0 @@ -[ -(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) -] diff --git a/tests/lang/eval-okay-builtins.exp b/tests/lang/eval-okay-builtins.exp deleted file mode 100644 index 0661686d6..000000000 --- a/tests/lang/eval-okay-builtins.exp +++ /dev/null @@ -1 +0,0 @@ -/foo diff --git a/tests/lang/eval-okay-builtins.nix b/tests/lang/eval-okay-builtins.nix deleted file mode 100644 index e9d65e88a..000000000 --- a/tests/lang/eval-okay-builtins.nix +++ /dev/null @@ -1,12 +0,0 @@ -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; - -} diff --git a/tests/lang/eval-okay-callable-attrs.exp b/tests/lang/eval-okay-callable-attrs.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-callable-attrs.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-callable-attrs.nix b/tests/lang/eval-okay-callable-attrs.nix deleted file mode 100644 index 310a030df..000000000 --- a/tests/lang/eval-okay-callable-attrs.nix +++ /dev/null @@ -1 +0,0 @@ -({ __functor = self: x: self.foo && x; foo = false; } // { foo = true; }) true diff --git a/tests/lang/eval-okay-catattrs.exp b/tests/lang/eval-okay-catattrs.exp deleted file mode 100644 index b4a1e66d6..000000000 --- a/tests/lang/eval-okay-catattrs.exp +++ /dev/null @@ -1 +0,0 @@ -[ 1 2 ] diff --git a/tests/lang/eval-okay-catattrs.nix b/tests/lang/eval-okay-catattrs.nix deleted file mode 100644 index 2c3dc10da..000000000 --- a/tests/lang/eval-okay-catattrs.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.catAttrs "a" [ { a = 1; } { b = 0; } { a = 2; } ] diff --git a/tests/lang/eval-okay-closure.exp b/tests/lang/eval-okay-closure.exp deleted file mode 100644 index e7dbf9781..000000000 --- a/tests/lang/eval-okay-closure.exp +++ /dev/null @@ -1 +0,0 @@ -[ { foo = true; key = -13; } { foo = true; key = -12; } { foo = true; key = -11; } { foo = true; key = -9; } { foo = true; key = -8; } { foo = true; key = -7; } { foo = true; key = -5; } { foo = true; key = -4; } { foo = true; key = -3; } { key = -1; } { foo = true; key = 0; } { foo = true; key = 1; } { foo = true; key = 2; } { foo = true; key = 4; } { foo = true; key = 5; } { foo = true; key = 6; } { key = 8; } { foo = true; key = 9; } { foo = true; key = 10; } { foo = true; key = 13; } { foo = true; key = 14; } { foo = true; key = 15; } { key = 17; } { foo = true; key = 18; } { foo = true; key = 19; } { foo = true; key = 22; } { foo = true; key = 23; } { key = 26; } { foo = true; key = 27; } { foo = true; key = 28; } { foo = true; key = 31; } { foo = true; key = 32; } { key = 35; } { foo = true; key = 36; } { foo = true; key = 40; } { foo = true; key = 41; } { key = 44; } { foo = true; key = 45; } { foo = true; key = 49; } { key = 53; } { foo = true; key = 54; } { foo = true; key = 58; } { key = 62; } { foo = true; key = 67; } { key = 71; } { key = 80; } ] diff --git a/tests/lang/eval-okay-closure.exp.xml b/tests/lang/eval-okay-closure.exp.xml deleted file mode 100644 index dffc03a99..000000000 --- a/tests/lang/eval-okay-closure.exp.xml +++ /dev/null @@ -1,343 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<expr> - <list> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-13" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-12" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-11" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-9" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-8" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-7" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-5" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-4" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="-3" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="-1" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="0" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="1" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="2" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="4" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="5" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="6" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="8" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="9" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="10" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="13" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="14" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="15" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="17" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="18" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="19" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="22" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="23" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="26" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="27" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="28" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="31" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="32" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="35" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="36" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="40" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="41" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="44" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="45" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="49" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="53" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="54" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="58" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="62" /> - </attr> - </attrs> - <attrs> - <attr name="foo"> - <bool value="true" /> - </attr> - <attr name="key"> - <int value="67" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="71" /> - </attr> - </attrs> - <attrs> - <attr name="key"> - <int value="80" /> - </attr> - </attrs> - </list> -</expr> diff --git a/tests/lang/eval-okay-closure.nix b/tests/lang/eval-okay-closure.nix deleted file mode 100644 index cccd4dc35..000000000 --- a/tests/lang/eval-okay-closure.nix +++ /dev/null @@ -1,13 +0,0 @@ -let - - closure = builtins.genericClosure { - startSet = [{key = 80;}]; - operator = {key, foo ? false}: - if builtins.lessThan key 0 - then [] - else [{key = builtins.sub key 9;} {key = builtins.sub key 13; foo = true;}]; - }; - - sort = (import ./lib.nix).sortBy (a: b: builtins.lessThan a.key b.key); - -in sort closure diff --git a/tests/lang/eval-okay-comments.exp b/tests/lang/eval-okay-comments.exp deleted file mode 100644 index 7182dc2f9..000000000 --- a/tests/lang/eval-okay-comments.exp +++ /dev/null @@ -1 +0,0 @@ -"abcdefghijklmnopqrstuvwxyz" diff --git a/tests/lang/eval-okay-comments.nix b/tests/lang/eval-okay-comments.nix deleted file mode 100644 index cb2cce218..000000000 --- a/tests/lang/eval-okay-comments.nix +++ /dev/null @@ -1,59 +0,0 @@ -# A simple comment -"a"+ # And another -## A double comment -"b"+ ## And another -# Nested # comments # -"c"+ # and # some # other # -# An empty line, following here: - -"d"+ # and a comment not starting the line ! - -"e"+ -/* multiline comments */ -"f" + -/* multiline - comments, - on - multiple - lines -*/ -"g" + -# Small, tricky comments -/**/ "h"+ /*/*/ "i"+ /***/ "j"+ /* /*/ "k"+ /*/* /*/ "l"+ -# Comments with an even number of ending '*' used to fail: -"m"+ -/* */ /* **/ /* ***/ /* ****/ "n"+ -/* */ /** */ /*** */ /**** */ "o"+ -/** **/ /*** ***/ /**** ****/ "p"+ -/* * ** *** **** ***** */ "q"+ -# Random comments -/* ***** ////// * / * / /* */ "r"+ -# Mixed comments -/* # */ -"s"+ -# /* # -"t"+ -# /* # */ -"u"+ -# /*********/ -"v"+ -## */* -"w"+ -/* - * Multiline, decorated comments - * # This ain't a nest'd comm'nt - */ -"x"+ -''${/** with **/"y" - # real - /* comments - inside ! # */ - - # (and empty lines) - -}''+ /* And a multiline comment, - on the same line, - after some spaces -*/ # followed by a one-line comment -"z" -/* EOF */ diff --git a/tests/lang/eval-okay-concat.exp b/tests/lang/eval-okay-concat.exp deleted file mode 100644 index bb4bbd577..000000000 --- a/tests/lang/eval-okay-concat.exp +++ /dev/null @@ -1 +0,0 @@ -[ 1 2 3 4 5 6 7 8 9 ] diff --git a/tests/lang/eval-okay-concat.nix b/tests/lang/eval-okay-concat.nix deleted file mode 100644 index d158a9bf0..000000000 --- a/tests/lang/eval-okay-concat.nix +++ /dev/null @@ -1 +0,0 @@ -[1 2 3] ++ [4 5 6] ++ [7 8 9] diff --git a/tests/lang/eval-okay-concatmap.exp b/tests/lang/eval-okay-concatmap.exp deleted file mode 100644 index 3b8be7739..000000000 --- a/tests/lang/eval-okay-concatmap.exp +++ /dev/null @@ -1 +0,0 @@ -[ [ 1 3 5 7 9 ] [ "a" "z" "b" "z" ] ] diff --git a/tests/lang/eval-okay-concatmap.nix b/tests/lang/eval-okay-concatmap.nix deleted file mode 100644 index 97da5d37a..000000000 --- a/tests/lang/eval-okay-concatmap.nix +++ /dev/null @@ -1,5 +0,0 @@ -with import ./lib.nix; - -[ (builtins.concatMap (x: if x / 2 * 2 == x then [] else [ x ]) (range 0 10)) - (builtins.concatMap (x: [x] ++ ["z"]) ["a" "b"]) -] diff --git a/tests/lang/eval-okay-concatstringssep.exp b/tests/lang/eval-okay-concatstringssep.exp deleted file mode 100644 index 93987647f..000000000 --- a/tests/lang/eval-okay-concatstringssep.exp +++ /dev/null @@ -1 +0,0 @@ -[ "" "foobarxyzzy" "foo, bar, xyzzy" "foo" "" ] diff --git a/tests/lang/eval-okay-concatstringssep.nix b/tests/lang/eval-okay-concatstringssep.nix deleted file mode 100644 index adc4c41bd..000000000 --- a/tests/lang/eval-okay-concatstringssep.nix +++ /dev/null @@ -1,8 +0,0 @@ -with builtins; - -[ (concatStringsSep "" []) - (concatStringsSep "" ["foo" "bar" "xyzzy"]) - (concatStringsSep ", " ["foo" "bar" "xyzzy"]) - (concatStringsSep ", " ["foo"]) - (concatStringsSep ", " []) -] diff --git a/tests/lang/eval-okay-context-introspection.exp b/tests/lang/eval-okay-context-introspection.exp deleted file mode 100644 index 03b400cc8..000000000 --- a/tests/lang/eval-okay-context-introspection.exp +++ /dev/null @@ -1 +0,0 @@ -[ true true true true true true ] diff --git a/tests/lang/eval-okay-context-introspection.nix b/tests/lang/eval-okay-context-introspection.nix deleted file mode 100644 index 50a78d946..000000000 --- a/tests/lang/eval-okay-context-introspection.nix +++ /dev/null @@ -1,41 +0,0 @@ -let - drv = derivation { - name = "fail"; - builder = "/bin/false"; - system = "x86_64-linux"; - outputs = [ "out" "foo" ]; - }; - - path = "${./eval-okay-context-introspection.nix}"; - - desired-context = { - "${builtins.unsafeDiscardStringContext path}" = { - path = true; - }; - "${builtins.unsafeDiscardStringContext drv.drvPath}" = { - outputs = [ "foo" "out" ]; - allOutputs = true; - }; - }; - - combo-path = "${path}${drv.outPath}${drv.foo.outPath}${drv.drvPath}"; - legit-context = builtins.getContext combo-path; - - reconstructed-path = builtins.appendContext - (builtins.unsafeDiscardStringContext combo-path) - desired-context; - - # Eta rule for strings with context. - etaRule = str: - str == builtins.appendContext - (builtins.unsafeDiscardStringContext str) - (builtins.getContext str); - -in [ - (legit-context == desired-context) - (reconstructed-path == combo-path) - (etaRule "foo") - (etaRule drv.drvPath) - (etaRule drv.foo.outPath) - (etaRule (builtins.unsafeDiscardOutputDependency drv.drvPath)) -] diff --git a/tests/lang/eval-okay-context.exp b/tests/lang/eval-okay-context.exp deleted file mode 100644 index 2f535bdbc..000000000 --- a/tests/lang/eval-okay-context.exp +++ /dev/null @@ -1 +0,0 @@ -"foo eval-okay-context.nix bar" diff --git a/tests/lang/eval-okay-context.nix b/tests/lang/eval-okay-context.nix deleted file mode 100644 index 7b9531cfe..000000000 --- a/tests/lang/eval-okay-context.nix +++ /dev/null @@ -1,6 +0,0 @@ -let s = "foo ${builtins.substring 33 100 (baseNameOf "${./eval-okay-context.nix}")} bar"; -in - if s != "foo eval-okay-context.nix bar" - then abort "context not discarded" - else builtins.unsafeDiscardStringContext s - diff --git a/tests/lang/eval-okay-curpos.exp b/tests/lang/eval-okay-curpos.exp deleted file mode 100644 index 65fd65b4d..000000000 --- a/tests/lang/eval-okay-curpos.exp +++ /dev/null @@ -1 +0,0 @@ -[ 3 7 4 9 ] diff --git a/tests/lang/eval-okay-curpos.nix b/tests/lang/eval-okay-curpos.nix deleted file mode 100644 index b79553df0..000000000 --- a/tests/lang/eval-okay-curpos.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Bla -let - x = __curPos; - y = __curPos; -in [ x.line x.column y.line y.column ] diff --git a/tests/lang/eval-okay-deepseq.exp b/tests/lang/eval-okay-deepseq.exp deleted file mode 100644 index 8d38505c1..000000000 --- a/tests/lang/eval-okay-deepseq.exp +++ /dev/null @@ -1 +0,0 @@ -456 diff --git a/tests/lang/eval-okay-deepseq.nix b/tests/lang/eval-okay-deepseq.nix deleted file mode 100644 index 53aa4b1dc..000000000 --- a/tests/lang/eval-okay-deepseq.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.deepSeq (let as = { x = 123; y = as; }; in as) 456 diff --git a/tests/lang/eval-okay-delayed-with-inherit.exp b/tests/lang/eval-okay-delayed-with-inherit.exp deleted file mode 100644 index eaacb55c1..000000000 --- a/tests/lang/eval-okay-delayed-with-inherit.exp +++ /dev/null @@ -1 +0,0 @@ -"b-overridden" diff --git a/tests/lang/eval-okay-delayed-with-inherit.nix b/tests/lang/eval-okay-delayed-with-inherit.nix deleted file mode 100644 index 84b388c27..000000000 --- a/tests/lang/eval-okay-delayed-with-inherit.nix +++ /dev/null @@ -1,24 +0,0 @@ -let - pkgs_ = with pkgs; { - a = derivation { - name = "a"; - system = builtins.currentSystem; - builder = "/bin/sh"; - args = [ "-c" "touch $out" ]; - inherit b; - }; - - inherit b; - }; - - packageOverrides = p: { - b = derivation { - name = "b-overridden"; - system = builtins.currentSystem; - builder = "/bin/sh"; - args = [ "-c" "touch $out" ]; - }; - }; - - pkgs = pkgs_ // (packageOverrides pkgs_); -in pkgs.a.b.name diff --git a/tests/lang/eval-okay-delayed-with.exp b/tests/lang/eval-okay-delayed-with.exp deleted file mode 100644 index 8e7c61ab8..000000000 --- a/tests/lang/eval-okay-delayed-with.exp +++ /dev/null @@ -1 +0,0 @@ -"b-overridden b-overridden a" diff --git a/tests/lang/eval-okay-delayed-with.nix b/tests/lang/eval-okay-delayed-with.nix deleted file mode 100644 index 3fb023e1c..000000000 --- a/tests/lang/eval-okay-delayed-with.nix +++ /dev/null @@ -1,29 +0,0 @@ -let - - pkgs_ = with pkgs; { - a = derivation { - name = "a"; - system = builtins.currentSystem; - builder = "/bin/sh"; - args = [ "-c" "touch $out" ]; - inherit b; - }; - - b = derivation { - name = "b"; - system = builtins.currentSystem; - builder = "/bin/sh"; - args = [ "-c" "touch $out" ]; - inherit a; - }; - - c = b; - }; - - packageOverrides = pkgs: with pkgs; { - b = derivation (b.drvAttrs // { name = "${b.name}-overridden"; }); - }; - - pkgs = pkgs_ // (packageOverrides pkgs_); - -in "${pkgs.a.b.name} ${pkgs.c.name} ${pkgs.b.a.name}" diff --git a/tests/lang/eval-okay-dynamic-attrs-2.exp b/tests/lang/eval-okay-dynamic-attrs-2.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-dynamic-attrs-2.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-dynamic-attrs-2.nix b/tests/lang/eval-okay-dynamic-attrs-2.nix deleted file mode 100644 index 6d57bf854..000000000 --- a/tests/lang/eval-okay-dynamic-attrs-2.nix +++ /dev/null @@ -1 +0,0 @@ -{ a."${"b"}" = true; a."${"c"}" = false; }.a.b diff --git a/tests/lang/eval-okay-dynamic-attrs-bare.exp b/tests/lang/eval-okay-dynamic-attrs-bare.exp deleted file mode 100644 index df8750afc..000000000 --- a/tests/lang/eval-okay-dynamic-attrs-bare.exp +++ /dev/null @@ -1 +0,0 @@ -{ binds = true; hasAttrs = true; multiAttrs = true; recBinds = true; selectAttrs = true; selectOrAttrs = true; } diff --git a/tests/lang/eval-okay-dynamic-attrs-bare.nix b/tests/lang/eval-okay-dynamic-attrs-bare.nix deleted file mode 100644 index 0dbe15e63..000000000 --- a/tests/lang/eval-okay-dynamic-attrs-bare.nix +++ /dev/null @@ -1,17 +0,0 @@ -let - aString = "a"; - - bString = "b"; -in { - hasAttrs = { a.b = null; } ? ${aString}.b; - - selectAttrs = { a.b = true; }.a.${bString}; - - selectOrAttrs = { }.${aString} or true; - - binds = { ${aString}."${bString}c" = true; }.a.bc; - - recBinds = rec { ${bString} = a; a = true; }.b; - - multiAttrs = { ${aString} = true; ${bString} = false; }.a; -} diff --git a/tests/lang/eval-okay-dynamic-attrs.exp b/tests/lang/eval-okay-dynamic-attrs.exp deleted file mode 100644 index df8750afc..000000000 --- a/tests/lang/eval-okay-dynamic-attrs.exp +++ /dev/null @@ -1 +0,0 @@ -{ binds = true; hasAttrs = true; multiAttrs = true; recBinds = true; selectAttrs = true; selectOrAttrs = true; } diff --git a/tests/lang/eval-okay-dynamic-attrs.nix b/tests/lang/eval-okay-dynamic-attrs.nix deleted file mode 100644 index ee02ac7e6..000000000 --- a/tests/lang/eval-okay-dynamic-attrs.nix +++ /dev/null @@ -1,17 +0,0 @@ -let - aString = "a"; - - bString = "b"; -in { - hasAttrs = { a.b = null; } ? "${aString}".b; - - selectAttrs = { a.b = true; }.a."${bString}"; - - selectOrAttrs = { }."${aString}" or true; - - binds = { "${aString}"."${bString}c" = true; }.a.bc; - - recBinds = rec { "${bString}" = a; a = true; }.b; - - multiAttrs = { "${aString}" = true; "${bString}" = false; }.a; -} diff --git a/tests/lang/eval-okay-elem.exp b/tests/lang/eval-okay-elem.exp deleted file mode 100644 index 3cf6c0e96..000000000 --- a/tests/lang/eval-okay-elem.exp +++ /dev/null @@ -1 +0,0 @@ -[ true false 30 ] diff --git a/tests/lang/eval-okay-elem.nix b/tests/lang/eval-okay-elem.nix deleted file mode 100644 index 71ea7a4ed..000000000 --- a/tests/lang/eval-okay-elem.nix +++ /dev/null @@ -1,6 +0,0 @@ -with import ./lib.nix; - -let xs = range 10 40; in - -[ (builtins.elem 23 xs) (builtins.elem 42 xs) (builtins.elemAt xs 20) ] - diff --git a/tests/lang/eval-okay-empty-args.exp b/tests/lang/eval-okay-empty-args.exp deleted file mode 100644 index cb5537d5d..000000000 --- a/tests/lang/eval-okay-empty-args.exp +++ /dev/null @@ -1 +0,0 @@ -"ab" diff --git a/tests/lang/eval-okay-empty-args.nix b/tests/lang/eval-okay-empty-args.nix deleted file mode 100644 index 78c133afd..000000000 --- a/tests/lang/eval-okay-empty-args.nix +++ /dev/null @@ -1 +0,0 @@ -({}: {x,y,}: "${x}${y}") {} {x = "a"; y = "b";} diff --git a/tests/lang/eval-okay-eq-derivations.exp b/tests/lang/eval-okay-eq-derivations.exp deleted file mode 100644 index ec04aab6a..000000000 --- a/tests/lang/eval-okay-eq-derivations.exp +++ /dev/null @@ -1 +0,0 @@ -[ true true true false ] diff --git a/tests/lang/eval-okay-eq-derivations.nix b/tests/lang/eval-okay-eq-derivations.nix deleted file mode 100644 index d526cb4a2..000000000 --- a/tests/lang/eval-okay-eq-derivations.nix +++ /dev/null @@ -1,10 +0,0 @@ -let - - drvA1 = derivation { name = "a"; builder = "/foo"; system = "i686-linux"; }; - drvA2 = derivation { name = "a"; builder = "/foo"; system = "i686-linux"; }; - drvA3 = derivation { name = "a"; builder = "/foo"; system = "i686-linux"; } // { dummy = 1; }; - - drvC1 = derivation { name = "c"; builder = "/foo"; system = "i686-linux"; }; - drvC2 = derivation { name = "c"; builder = "/bar"; system = "i686-linux"; }; - -in [ (drvA1 == drvA1) (drvA1 == drvA2) (drvA1 == drvA3) (drvC1 == drvC2) ] diff --git a/tests/lang/eval-okay-eq.exp b/tests/lang/eval-okay-eq.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-eq.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-eq.nix b/tests/lang/eval-okay-eq.nix deleted file mode 100644 index 73d200b38..000000000 --- a/tests/lang/eval-okay-eq.nix +++ /dev/null @@ -1,3 +0,0 @@ -["foobar" (rec {x = 1; y = x;})] -== -[("foo" + "bar") ({x = 1; y = 1;})] diff --git a/tests/lang/eval-okay-filter.exp b/tests/lang/eval-okay-filter.exp deleted file mode 100644 index 355d51c27..000000000 --- a/tests/lang/eval-okay-filter.exp +++ /dev/null @@ -1 +0,0 @@ -[ 0 2 4 6 8 10 100 102 104 106 108 110 ] diff --git a/tests/lang/eval-okay-filter.nix b/tests/lang/eval-okay-filter.nix deleted file mode 100644 index 85109b0d0..000000000 --- a/tests/lang/eval-okay-filter.nix +++ /dev/null @@ -1,5 +0,0 @@ -with import ./lib.nix; - -builtins.filter - (x: x / 2 * 2 == x) - (builtins.concatLists [ (range 0 10) (range 100 110) ]) diff --git a/tests/lang/eval-okay-flake-ref-to-string.exp b/tests/lang/eval-okay-flake-ref-to-string.exp deleted file mode 100644 index 110f8442d..000000000 --- a/tests/lang/eval-okay-flake-ref-to-string.exp +++ /dev/null @@ -1 +0,0 @@ -"github:NixOS/nixpkgs/23.05?dir=lib" diff --git a/tests/lang/eval-okay-flake-ref-to-string.nix b/tests/lang/eval-okay-flake-ref-to-string.nix deleted file mode 100644 index dbb4e5b2a..000000000 --- a/tests/lang/eval-okay-flake-ref-to-string.nix +++ /dev/null @@ -1,7 +0,0 @@ -builtins.flakeRefToString { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "23.05"; - dir = "lib"; -} diff --git a/tests/lang/eval-okay-flatten.exp b/tests/lang/eval-okay-flatten.exp deleted file mode 100644 index b979b2b8b..000000000 --- a/tests/lang/eval-okay-flatten.exp +++ /dev/null @@ -1 +0,0 @@ -"1234567" diff --git a/tests/lang/eval-okay-flatten.nix b/tests/lang/eval-okay-flatten.nix deleted file mode 100644 index fe911e968..000000000 --- a/tests/lang/eval-okay-flatten.nix +++ /dev/null @@ -1,8 +0,0 @@ -with import ./lib.nix; - -let { - - l = ["1" "2" ["3" ["4"] ["5" "6"]] "7"]; - - body = concat (flatten l); -} diff --git a/tests/lang/eval-okay-float.exp b/tests/lang/eval-okay-float.exp deleted file mode 100644 index 3c50a8adc..000000000 --- a/tests/lang/eval-okay-float.exp +++ /dev/null @@ -1 +0,0 @@ -[ 3.4 3.5 2.5 1.5 ] diff --git a/tests/lang/eval-okay-float.nix b/tests/lang/eval-okay-float.nix deleted file mode 100644 index b2702c7b1..000000000 --- a/tests/lang/eval-okay-float.nix +++ /dev/null @@ -1,6 +0,0 @@ -[ - (1.1 + 2.3) - (builtins.add (0.5 + 0.5) (2.0 + 0.5)) - ((0.5 + 0.5) * (2.0 + 0.5)) - ((1.5 + 1.5) / (0.5 * 4.0)) -] diff --git a/tests/lang/eval-okay-floor-ceil.exp b/tests/lang/eval-okay-floor-ceil.exp deleted file mode 100644 index 81f80420b..000000000 --- a/tests/lang/eval-okay-floor-ceil.exp +++ /dev/null @@ -1 +0,0 @@ -"23;24;23;23" diff --git a/tests/lang/eval-okay-floor-ceil.nix b/tests/lang/eval-okay-floor-ceil.nix deleted file mode 100644 index d76a0d86e..000000000 --- a/tests/lang/eval-okay-floor-ceil.nix +++ /dev/null @@ -1,9 +0,0 @@ -with import ./lib.nix; - -let - n1 = builtins.floor 23.5; - n2 = builtins.ceil 23.5; - n3 = builtins.floor 23; - n4 = builtins.ceil 23; -in - builtins.concatStringsSep ";" (map toString [ n1 n2 n3 n4 ]) diff --git a/tests/lang/eval-okay-foldlStrict-lazy-elements.exp b/tests/lang/eval-okay-foldlStrict-lazy-elements.exp deleted file mode 100644 index d81cc0710..000000000 --- a/tests/lang/eval-okay-foldlStrict-lazy-elements.exp +++ /dev/null @@ -1 +0,0 @@ -42 diff --git a/tests/lang/eval-okay-foldlStrict-lazy-elements.nix b/tests/lang/eval-okay-foldlStrict-lazy-elements.nix deleted file mode 100644 index c666e07f3..000000000 --- a/tests/lang/eval-okay-foldlStrict-lazy-elements.nix +++ /dev/null @@ -1,9 +0,0 @@ -# Tests that the rhs argument of op is not forced unconditionally -let - lst = builtins.foldl' - (acc: x: acc ++ [ x ]) - [ ] - [ 42 (throw "this shouldn't be evaluated") ]; -in - -builtins.head lst diff --git a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp b/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp deleted file mode 100644 index d81cc0710..000000000 --- a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp +++ /dev/null @@ -1 +0,0 @@ -42 diff --git a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix b/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix deleted file mode 100644 index abcd5366a..000000000 --- a/tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Checks that the nul value for the accumulator is not forced unconditionally. -# Some languages provide a foldl' that is strict in this argument, but Nix does not. -builtins.foldl' - (_: x: x) - (throw "This is never forced") - [ "but the results of applying op are" 42 ] diff --git a/tests/lang/eval-okay-foldlStrict.exp b/tests/lang/eval-okay-foldlStrict.exp deleted file mode 100644 index 837e12b40..000000000 --- a/tests/lang/eval-okay-foldlStrict.exp +++ /dev/null @@ -1 +0,0 @@ -500500 diff --git a/tests/lang/eval-okay-foldlStrict.nix b/tests/lang/eval-okay-foldlStrict.nix deleted file mode 100644 index 3b87188d2..000000000 --- a/tests/lang/eval-okay-foldlStrict.nix +++ /dev/null @@ -1,3 +0,0 @@ -with import ./lib.nix; - -builtins.foldl' (x: y: x + y) 0 (range 1 1000) diff --git a/tests/lang/eval-okay-fromTOML-timestamps.exp b/tests/lang/eval-okay-fromTOML-timestamps.exp deleted file mode 100644 index 08b3c69a6..000000000 --- a/tests/lang/eval-okay-fromTOML-timestamps.exp +++ /dev/null @@ -1 +0,0 @@ -{ "1234" = "value"; "127.0.0.1" = "value"; a = { b = { c = { }; }; }; arr1 = [ 1 2 3 ]; arr2 = [ "red" "yellow" "green" ]; arr3 = [ [ 1 2 ] [ 3 4 5 ] ]; arr4 = [ "all" "strings" "are the same" "type" ]; arr5 = [ [ 1 2 ] [ "a" "b" "c" ] ]; arr7 = [ 1 2 3 ]; arr8 = [ 1 2 ]; bare-key = "value"; bare_key = "value"; bin1 = 214; bool1 = true; bool2 = false; "character encoding" = "value"; d = { e = { f = { }; }; }; dog = { "tater.man" = { type = { name = "pug"; }; }; }; flt1 = 1; flt2 = 3.1415; flt3 = -0.01; flt4 = 5e+22; flt5 = 1e+06; flt6 = -0.02; flt7 = 6.626e-34; flt8 = 9.22462e+06; fruit = [ { name = "apple"; physical = { color = "red"; shape = "round"; }; variety = [ { name = "red delicious"; } { name = "granny smith"; } ]; } { name = "banana"; variety = [ { name = "plantain"; } ]; } ]; g = { h = { i = { }; }; }; hex1 = 3735928559; hex2 = 3735928559; hex3 = 3735928559; int1 = 99; int2 = 42; int3 = 0; int4 = -17; int5 = 1000; int6 = 5349221; int7 = 12345; j = { "ʞ" = { l = { }; }; }; key = "value"; key2 = "value"; ld1 = { _type = "timestamp"; value = "1979-05-27"; }; ldt1 = { _type = "timestamp"; value = "1979-05-27T07:32:00"; }; ldt2 = { _type = "timestamp"; value = "1979-05-27T00:32:00.999999"; }; lt1 = { _type = "timestamp"; value = "07:32:00"; }; lt2 = { _type = "timestamp"; value = "00:32:00.999999"; }; name = "Orange"; oct1 = 342391; oct2 = 493; odt1 = { _type = "timestamp"; value = "1979-05-27T07:32:00Z"; }; odt2 = { _type = "timestamp"; value = "1979-05-27T00:32:00-07:00"; }; odt3 = { _type = "timestamp"; value = "1979-05-27T00:32:00.999999-07:00"; }; odt4 = { _type = "timestamp"; value = "1979-05-27T07:32:00Z"; }; physical = { color = "orange"; shape = "round"; }; products = [ { name = "Hammer"; sku = 738594937; } { } { color = "gray"; name = "Nail"; sku = 284758393; } ]; "quoted \"value\"" = "value"; site = { "google.com" = true; }; str = "I'm a string. \"You can quote me\". Name\tJosé\nLocation\tSF."; table-1 = { key1 = "some string"; key2 = 123; }; table-2 = { key1 = "another string"; key2 = 456; }; x = { y = { z = { w = { animal = { type = { name = "pug"; }; }; name = { first = "Tom"; last = "Preston-Werner"; }; point = { x = 1; y = 2; }; }; }; }; }; "ʎǝʞ" = "value"; } diff --git a/tests/lang/eval-okay-fromTOML-timestamps.flags b/tests/lang/eval-okay-fromTOML-timestamps.flags deleted file mode 100644 index 9ed39dc6b..000000000 --- a/tests/lang/eval-okay-fromTOML-timestamps.flags +++ /dev/null @@ -1 +0,0 @@ ---extra-experimental-features parse-toml-timestamps diff --git a/tests/lang/eval-okay-fromTOML-timestamps.nix b/tests/lang/eval-okay-fromTOML-timestamps.nix deleted file mode 100644 index 74cff9470..000000000 --- a/tests/lang/eval-okay-fromTOML-timestamps.nix +++ /dev/null @@ -1,130 +0,0 @@ -builtins.fromTOML '' - key = "value" - bare_key = "value" - bare-key = "value" - 1234 = "value" - - "127.0.0.1" = "value" - "character encoding" = "value" - "ʎǝʞ" = "value" - 'key2' = "value" - 'quoted "value"' = "value" - - name = "Orange" - - physical.color = "orange" - physical.shape = "round" - site."google.com" = true - - # This is legal according to the spec, but cpptoml doesn't handle it. - #a.b.c = 1 - #a.d = 2 - - str = "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF." - - int1 = +99 - int2 = 42 - int3 = 0 - int4 = -17 - int5 = 1_000 - int6 = 5_349_221 - int7 = 1_2_3_4_5 - - hex1 = 0xDEADBEEF - hex2 = 0xdeadbeef - hex3 = 0xdead_beef - - oct1 = 0o01234567 - oct2 = 0o755 - - bin1 = 0b11010110 - - flt1 = +1.0 - flt2 = 3.1415 - flt3 = -0.01 - flt4 = 5e+22 - flt5 = 1e6 - flt6 = -2E-2 - flt7 = 6.626e-34 - flt8 = 9_224_617.445_991_228_313 - - bool1 = true - bool2 = false - - odt1 = 1979-05-27T07:32:00Z - odt2 = 1979-05-27T00:32:00-07:00 - odt3 = 1979-05-27T00:32:00.999999-07:00 - odt4 = 1979-05-27 07:32:00Z - ldt1 = 1979-05-27T07:32:00 - ldt2 = 1979-05-27T00:32:00.999999 - ld1 = 1979-05-27 - lt1 = 07:32:00 - lt2 = 00:32:00.999999 - - arr1 = [ 1, 2, 3 ] - arr2 = [ "red", "yellow", "green" ] - arr3 = [ [ 1, 2 ], [3, 4, 5] ] - arr4 = [ "all", 'strings', """are the same""", ''''type''''] - arr5 = [ [ 1, 2 ], ["a", "b", "c"] ] - - arr7 = [ - 1, 2, 3 - ] - - arr8 = [ - 1, - 2, # this is ok - ] - - [table-1] - key1 = "some string" - key2 = 123 - - - [table-2] - key1 = "another string" - key2 = 456 - - [dog."tater.man"] - type.name = "pug" - - [a.b.c] - [ d.e.f ] - [ g . h . i ] - [ j . "ʞ" . 'l' ] - [x.y.z.w] - - name = { first = "Tom", last = "Preston-Werner" } - point = { x = 1, y = 2 } - animal = { type.name = "pug" } - - [[products]] - name = "Hammer" - sku = 738594937 - - [[products]] - - [[products]] - name = "Nail" - sku = 284758393 - color = "gray" - - [[fruit]] - name = "apple" - - [fruit.physical] - color = "red" - shape = "round" - - [[fruit.variety]] - name = "red delicious" - - [[fruit.variety]] - name = "granny smith" - - [[fruit]] - name = "banana" - - [[fruit.variety]] - name = "plantain" -'' diff --git a/tests/lang/eval-okay-fromTOML.exp b/tests/lang/eval-okay-fromTOML.exp deleted file mode 100644 index d0dd3af2c..000000000 --- a/tests/lang/eval-okay-fromTOML.exp +++ /dev/null @@ -1 +0,0 @@ -[ { clients = { data = [ [ "gamma" "delta" ] [ 1 2 ] ]; hosts = [ "alpha" "omega" ]; }; database = { connection_max = 5000; enabled = true; ports = [ 8001 8001 8002 ]; server = "192.168.1.1"; }; owner = { name = "Tom Preston-Werner"; }; servers = { alpha = { dc = "eqdc10"; ip = "10.0.0.1"; }; beta = { dc = "eqdc10"; ip = "10.0.0.2"; }; }; title = "TOML Example"; } { "1234" = "value"; "127.0.0.1" = "value"; a = { b = { c = { }; }; }; arr1 = [ 1 2 3 ]; arr2 = [ "red" "yellow" "green" ]; arr3 = [ [ 1 2 ] [ 3 4 5 ] ]; arr4 = [ "all" "strings" "are the same" "type" ]; arr5 = [ [ 1 2 ] [ "a" "b" "c" ] ]; arr7 = [ 1 2 3 ]; arr8 = [ 1 2 ]; bare-key = "value"; bare_key = "value"; bin1 = 214; bool1 = true; bool2 = false; "character encoding" = "value"; d = { e = { f = { }; }; }; dog = { "tater.man" = { type = { name = "pug"; }; }; }; flt1 = 1; flt2 = 3.1415; flt3 = -0.01; flt4 = 5e+22; flt5 = 1e+06; flt6 = -0.02; flt7 = 6.626e-34; flt8 = 9.22462e+06; fruit = [ { name = "apple"; physical = { color = "red"; shape = "round"; }; variety = [ { name = "red delicious"; } { name = "granny smith"; } ]; } { name = "banana"; variety = [ { name = "plantain"; } ]; } ]; g = { h = { i = { }; }; }; hex1 = 3735928559; hex2 = 3735928559; hex3 = 3735928559; int1 = 99; int2 = 42; int3 = 0; int4 = -17; int5 = 1000; int6 = 5349221; int7 = 12345; j = { "ʞ" = { l = { }; }; }; key = "value"; key2 = "value"; name = "Orange"; oct1 = 342391; oct2 = 493; physical = { color = "orange"; shape = "round"; }; products = [ { name = "Hammer"; sku = 738594937; } { } { color = "gray"; name = "Nail"; sku = 284758393; } ]; "quoted \"value\"" = "value"; site = { "google.com" = true; }; str = "I'm a string. \"You can quote me\". Name\tJosé\nLocation\tSF."; table-1 = { key1 = "some string"; key2 = 123; }; table-2 = { key1 = "another string"; key2 = 456; }; x = { y = { z = { w = { animal = { type = { name = "pug"; }; }; name = { first = "Tom"; last = "Preston-Werner"; }; point = { x = 1; y = 2; }; }; }; }; }; "ʎǝʞ" = "value"; } { metadata = { "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"; "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"; "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"; "checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef"; }; package = [ { dependencies = [ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" ]; name = "aho-corasick"; source = "registry+https://github.com/rust-lang/crates.io-index"; version = "0.6.4"; } { name = "ansi_term"; source = "registry+https://github.com/rust-lang/crates.io-index"; version = "0.9.0"; } { dependencies = [ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" ]; name = "atty"; source = "registry+https://github.com/rust-lang/crates.io-index"; version = "0.2.10"; } ]; } { a = [ [ { b = true; } ] ]; c = [ [ { d = true; } ] ]; e = [ [ 123 ] ]; } ] diff --git a/tests/lang/eval-okay-fromTOML.nix b/tests/lang/eval-okay-fromTOML.nix deleted file mode 100644 index 963932689..000000000 --- a/tests/lang/eval-okay-fromTOML.nix +++ /dev/null @@ -1,208 +0,0 @@ -[ - - (builtins.fromTOML '' - # This is a TOML document. - - title = "TOML Example" - - [owner] - name = "Tom Preston-Werner" - #dob = 1979-05-27T07:32:00-08:00 # First class dates - - [database] - server = "192.168.1.1" - ports = [ 8001, 8001, 8002 ] - connection_max = 5000 - enabled = true - - [servers] - - # Indentation (tabs and/or spaces) is allowed but not required - [servers.alpha] - ip = "10.0.0.1" - dc = "eqdc10" - - [servers.beta] - ip = "10.0.0.2" - dc = "eqdc10" - - [clients] - data = [ ["gamma", "delta"], [1, 2] ] - - # Line breaks are OK when inside arrays - hosts = [ - "alpha", - "omega" - ] - '') - - (builtins.fromTOML '' - key = "value" - bare_key = "value" - bare-key = "value" - 1234 = "value" - - "127.0.0.1" = "value" - "character encoding" = "value" - "ʎǝʞ" = "value" - 'key2' = "value" - 'quoted "value"' = "value" - - name = "Orange" - - physical.color = "orange" - physical.shape = "round" - site."google.com" = true - - # This is legal according to the spec, but cpptoml doesn't handle it. - #a.b.c = 1 - #a.d = 2 - - str = "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF." - - int1 = +99 - int2 = 42 - int3 = 0 - int4 = -17 - int5 = 1_000 - int6 = 5_349_221 - int7 = 1_2_3_4_5 - - hex1 = 0xDEADBEEF - hex2 = 0xdeadbeef - hex3 = 0xdead_beef - - oct1 = 0o01234567 - oct2 = 0o755 - - bin1 = 0b11010110 - - flt1 = +1.0 - flt2 = 3.1415 - flt3 = -0.01 - flt4 = 5e+22 - flt5 = 1e6 - flt6 = -2E-2 - flt7 = 6.626e-34 - flt8 = 9_224_617.445_991_228_313 - - bool1 = true - bool2 = false - - # FIXME: not supported because Nix doesn't have a date/time type. - #odt1 = 1979-05-27T07:32:00Z - #odt2 = 1979-05-27T00:32:00-07:00 - #odt3 = 1979-05-27T00:32:00.999999-07:00 - #odt4 = 1979-05-27 07:32:00Z - #ldt1 = 1979-05-27T07:32:00 - #ldt2 = 1979-05-27T00:32:00.999999 - #ld1 = 1979-05-27 - #lt1 = 07:32:00 - #lt2 = 00:32:00.999999 - - arr1 = [ 1, 2, 3 ] - arr2 = [ "red", "yellow", "green" ] - arr3 = [ [ 1, 2 ], [3, 4, 5] ] - arr4 = [ "all", 'strings', """are the same""", ''''type''''] - arr5 = [ [ 1, 2 ], ["a", "b", "c"] ] - - arr7 = [ - 1, 2, 3 - ] - - arr8 = [ - 1, - 2, # this is ok - ] - - [table-1] - key1 = "some string" - key2 = 123 - - - [table-2] - key1 = "another string" - key2 = 456 - - [dog."tater.man"] - type.name = "pug" - - [a.b.c] - [ d.e.f ] - [ g . h . i ] - [ j . "ʞ" . 'l' ] - [x.y.z.w] - - name = { first = "Tom", last = "Preston-Werner" } - point = { x = 1, y = 2 } - animal = { type.name = "pug" } - - [[products]] - name = "Hammer" - sku = 738594937 - - [[products]] - - [[products]] - name = "Nail" - sku = 284758393 - color = "gray" - - [[fruit]] - name = "apple" - - [fruit.physical] - color = "red" - shape = "round" - - [[fruit.variety]] - name = "red delicious" - - [[fruit.variety]] - name = "granny smith" - - [[fruit]] - name = "banana" - - [[fruit.variety]] - name = "plantain" - '') - - (builtins.fromTOML '' - [[package]] - name = "aho-corasick" - version = "0.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "ansi_term" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "atty" - version = "0.2.10" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [metadata] - "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4" - "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" - "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" - "checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef" - '') - - (builtins.fromTOML '' - a = [[{ b = true }]] - c = [ [ { d = true } ] ] - e = [[123]] - '') - -] diff --git a/tests/lang/eval-okay-fromjson-escapes.exp b/tests/lang/eval-okay-fromjson-escapes.exp deleted file mode 100644 index add5505a8..000000000 --- a/tests/lang/eval-okay-fromjson-escapes.exp +++ /dev/null @@ -1 +0,0 @@ -"quote \" reverse solidus \\ solidus / backspace formfeed newline \n carriage return \r horizontal tab \t 1 char unicode encoded backspace 1 char unicode encoded e with accent é 2 char unicode encoded s with caron š 3 char unicode encoded rightwards arrow →" diff --git a/tests/lang/eval-okay-fromjson-escapes.nix b/tests/lang/eval-okay-fromjson-escapes.nix deleted file mode 100644 index f00713507..000000000 --- a/tests/lang/eval-okay-fromjson-escapes.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This string contains all supported escapes in a JSON string, per json.org -# \b and \f are not supported by Nix -builtins.fromJSON ''"quote \" reverse solidus \\ solidus \/ backspace \b formfeed \f newline \n carriage return \r horizontal tab \t 1 char unicode encoded backspace \u0008 1 char unicode encoded e with accent \u00e9 2 char unicode encoded s with caron \u0161 3 char unicode encoded rightwards arrow \u2192"'' diff --git a/tests/lang/eval-okay-fromjson.exp b/tests/lang/eval-okay-fromjson.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-fromjson.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-fromjson.nix b/tests/lang/eval-okay-fromjson.nix deleted file mode 100644 index 4c526b9ae..000000000 --- a/tests/lang/eval-okay-fromjson.nix +++ /dev/null @@ -1,41 +0,0 @@ -builtins.fromJSON - '' - { - "Video": { - "Title": "The Penguin Chronicles", - "Width": 1920, - "Height": 1080, - "EmbeddedData": [3.14159, 23493,null, true ,false, -10], - "Thumb": { - "Url": "http://www.example.com/video/5678931", - "Width": 200, - "Height": 250 - }, - "Animated" : false, - "IDs": [116, 943, 234, 38793, true ,false,null, -100], - "Escapes": "\"\\\/\t\n\r\t", - "Subtitle" : false, - "Latitude": 37.7668, - "Longitude": -122.3959 - } - } - '' -== - { Video = - { Title = "The Penguin Chronicles"; - Width = 1920; - Height = 1080; - EmbeddedData = [ 3.14159 23493 null true false (0-10) ]; - Thumb = - { Url = "http://www.example.com/video/5678931"; - Width = 200; - Height = 250; - }; - Animated = false; - IDs = [ 116 943 234 38793 true false null (0-100) ]; - Escapes = "\"\\\/\t\n\r\t"; # supported in JSON but not Nix: \b\f - Subtitle = false; - Latitude = 37.7668; - Longitude = -122.3959; - }; - } diff --git a/tests/lang/eval-okay-functionargs.exp b/tests/lang/eval-okay-functionargs.exp deleted file mode 100644 index c1c9f8ffa..000000000 --- a/tests/lang/eval-okay-functionargs.exp +++ /dev/null @@ -1 +0,0 @@ -[ "stdenv" "fetchurl" "aterm-stdenv" "aterm-stdenv2" "libX11" "libXv" "mplayer-stdenv2.libXv-libX11" "mplayer-stdenv2.libXv-libX11_2" "nix-stdenv-aterm-stdenv" "nix-stdenv2-aterm2-stdenv2" ] diff --git a/tests/lang/eval-okay-functionargs.exp.xml b/tests/lang/eval-okay-functionargs.exp.xml deleted file mode 100644 index 651f54c36..000000000 --- a/tests/lang/eval-okay-functionargs.exp.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<expr> - <list> - <string value="stdenv" /> - <string value="fetchurl" /> - <string value="aterm-stdenv" /> - <string value="aterm-stdenv2" /> - <string value="libX11" /> - <string value="libXv" /> - <string value="mplayer-stdenv2.libXv-libX11" /> - <string value="mplayer-stdenv2.libXv-libX11_2" /> - <string value="nix-stdenv-aterm-stdenv" /> - <string value="nix-stdenv2-aterm2-stdenv2" /> - </list> -</expr> diff --git a/tests/lang/eval-okay-functionargs.nix b/tests/lang/eval-okay-functionargs.nix deleted file mode 100644 index 68dca62ee..000000000 --- a/tests/lang/eval-okay-functionargs.nix +++ /dev/null @@ -1,80 +0,0 @@ -let - - stdenvFun = { }: { name = "stdenv"; }; - stdenv2Fun = { }: { name = "stdenv2"; }; - fetchurlFun = { stdenv }: assert stdenv.name == "stdenv"; { name = "fetchurl"; }; - atermFun = { stdenv, fetchurl }: { name = "aterm-${stdenv.name}"; }; - aterm2Fun = { stdenv, fetchurl }: { name = "aterm2-${stdenv.name}"; }; - nixFun = { stdenv, fetchurl, aterm }: { name = "nix-${stdenv.name}-${aterm.name}"; }; - - mplayerFun = - { stdenv, fetchurl, enableX11 ? false, xorg ? null, enableFoo ? true, foo ? null }: - assert stdenv.name == "stdenv2"; - assert enableX11 -> xorg.libXv.name == "libXv"; - assert enableFoo -> foo != null; - { name = "mplayer-${stdenv.name}.${xorg.libXv.name}-${xorg.libX11.name}"; }; - - makeOverridable = f: origArgs: f origArgs // - { override = newArgs: - makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); - }; - - callPackage_ = pkgs: f: args: - makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) pkgs) // args); - - allPackages = - { overrides ? (pkgs: pkgsPrev: { }) }: - let - callPackage = callPackage_ pkgs; - pkgs = pkgsStd // (overrides pkgs pkgsStd); - pkgsStd = { - inherit pkgs; - stdenv = callPackage stdenvFun { }; - stdenv2 = callPackage stdenv2Fun { }; - fetchurl = callPackage fetchurlFun { }; - aterm = callPackage atermFun { }; - xorg = callPackage xorgFun { }; - mplayer = callPackage mplayerFun { stdenv = pkgs.stdenv2; enableFoo = false; }; - nix = callPackage nixFun { }; - }; - in pkgs; - - libX11Fun = { stdenv, fetchurl }: { name = "libX11"; }; - libX11_2Fun = { stdenv, fetchurl }: { name = "libX11_2"; }; - libXvFun = { stdenv, fetchurl, libX11 }: { name = "libXv"; }; - - xorgFun = - { pkgs }: - let callPackage = callPackage_ (pkgs // pkgs.xorg); in - { - libX11 = callPackage libX11Fun { }; - libXv = callPackage libXvFun { }; - }; - -in - -let - - pkgs = allPackages { }; - - pkgs2 = allPackages { - overrides = pkgs: pkgsPrev: { - stdenv = pkgs.stdenv2; - nix = pkgsPrev.nix.override { aterm = aterm2Fun { inherit (pkgs) stdenv fetchurl; }; }; - xorg = pkgsPrev.xorg // { libX11 = libX11_2Fun { inherit (pkgs) stdenv fetchurl; }; }; - }; - }; - -in - - [ pkgs.stdenv.name - pkgs.fetchurl.name - pkgs.aterm.name - pkgs2.aterm.name - pkgs.xorg.libX11.name - pkgs.xorg.libXv.name - pkgs.mplayer.name - pkgs2.mplayer.name - pkgs.nix.name - pkgs2.nix.name - ] diff --git a/tests/lang/eval-okay-getattrpos-functionargs.exp b/tests/lang/eval-okay-getattrpos-functionargs.exp deleted file mode 100644 index 7f9ac40e8..000000000 --- a/tests/lang/eval-okay-getattrpos-functionargs.exp +++ /dev/null @@ -1 +0,0 @@ -{ column = 11; file = "eval-okay-getattrpos-functionargs.nix"; line = 2; } diff --git a/tests/lang/eval-okay-getattrpos-functionargs.nix b/tests/lang/eval-okay-getattrpos-functionargs.nix deleted file mode 100644 index 11d6bb0e3..000000000 --- a/tests/lang/eval-okay-getattrpos-functionargs.nix +++ /dev/null @@ -1,4 +0,0 @@ -let - fun = { foo }: {}; - pos = builtins.unsafeGetAttrPos "foo" (builtins.functionArgs fun); -in { inherit (pos) column line; file = baseNameOf pos.file; } diff --git a/tests/lang/eval-okay-getattrpos-undefined.exp b/tests/lang/eval-okay-getattrpos-undefined.exp deleted file mode 100644 index 19765bd50..000000000 --- a/tests/lang/eval-okay-getattrpos-undefined.exp +++ /dev/null @@ -1 +0,0 @@ -null diff --git a/tests/lang/eval-okay-getattrpos-undefined.nix b/tests/lang/eval-okay-getattrpos-undefined.nix deleted file mode 100644 index 14dd38f77..000000000 --- a/tests/lang/eval-okay-getattrpos-undefined.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.unsafeGetAttrPos "abort" builtins diff --git a/tests/lang/eval-okay-getattrpos.exp b/tests/lang/eval-okay-getattrpos.exp deleted file mode 100644 index 469249bbc..000000000 --- a/tests/lang/eval-okay-getattrpos.exp +++ /dev/null @@ -1 +0,0 @@ -{ column = 5; file = "eval-okay-getattrpos.nix"; line = 3; } diff --git a/tests/lang/eval-okay-getattrpos.nix b/tests/lang/eval-okay-getattrpos.nix deleted file mode 100644 index ca6b07961..000000000 --- a/tests/lang/eval-okay-getattrpos.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - as = { - foo = "bar"; - }; - pos = builtins.unsafeGetAttrPos "foo" as; -in { inherit (pos) column line; file = baseNameOf pos.file; } diff --git a/tests/lang/eval-okay-getenv.exp b/tests/lang/eval-okay-getenv.exp deleted file mode 100644 index 14e24d419..000000000 --- a/tests/lang/eval-okay-getenv.exp +++ /dev/null @@ -1 +0,0 @@ -"foobar" diff --git a/tests/lang/eval-okay-getenv.nix b/tests/lang/eval-okay-getenv.nix deleted file mode 100644 index 4cfec5f55..000000000 --- a/tests/lang/eval-okay-getenv.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.getEnv "TEST_VAR" + (if builtins.getEnv "NO_SUCH_VAR" == "" then "bar" else "bla") diff --git a/tests/lang/eval-okay-groupBy.exp b/tests/lang/eval-okay-groupBy.exp deleted file mode 100644 index bfca5652a..000000000 --- a/tests/lang/eval-okay-groupBy.exp +++ /dev/null @@ -1 +0,0 @@ -{ "1" = [ 9 ]; "2" = [ 8 ]; "3" = [ 13 29 ]; "4" = [ 3 4 10 11 17 18 ]; "5" = [ 0 23 26 28 ]; "6" = [ 1 12 21 27 30 ]; "7" = [ 7 22 ]; "8" = [ 14 ]; "9" = [ 19 ]; b = [ 16 25 ]; c = [ 24 ]; d = [ 2 ]; e = [ 5 6 15 31 ]; f = [ 20 ]; } diff --git a/tests/lang/eval-okay-groupBy.nix b/tests/lang/eval-okay-groupBy.nix deleted file mode 100644 index 862d89dbd..000000000 --- a/tests/lang/eval-okay-groupBy.nix +++ /dev/null @@ -1,5 +0,0 @@ -with import ./lib.nix; - -builtins.groupBy (n: - builtins.substring 0 1 (builtins.hashString "sha256" (toString n)) -) (range 0 31) diff --git a/tests/lang/eval-okay-hash.exp b/tests/lang/eval-okay-hash.exp deleted file mode 100644 index e69de29bb..000000000 --- a/tests/lang/eval-okay-hash.exp +++ /dev/null diff --git a/tests/lang/eval-okay-hashfile.exp b/tests/lang/eval-okay-hashfile.exp deleted file mode 100644 index ff1e8293e..000000000 --- a/tests/lang/eval-okay-hashfile.exp +++ /dev/null @@ -1 +0,0 @@ -[ "d3b07384d113edec49eaa6238ad5ff00" "0f343b0931126a20f133d67c2b018a3b" "f1d2d2f924e986ac86fdf7b36c94bcdf32beec15" "60cacbf3d72e1e7834203da608037b1bf83b40e8" "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c" "5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" "0cf9180a764aba863a67b6d72f0918bc131c6772642cb2dce5a34f0a702f9470ddc2bf125c12198b1995c233c34b4afd346c54a2334c350a948a51b6e8b4e6b6" "8efb4f73c5655351c444eb109230c556d39e2c7624e9c11abc9e3fb4b9b9254218cc5085b454a9698d085cfa92198491f07a723be4574adc70617b73eb0b6461" ] diff --git a/tests/lang/eval-okay-hashfile.nix b/tests/lang/eval-okay-hashfile.nix deleted file mode 100644 index aff5a1856..000000000 --- a/tests/lang/eval-okay-hashfile.nix +++ /dev/null @@ -1,4 +0,0 @@ -let - paths = [ ./data ./binary-data ]; -in - builtins.concatLists (map (hash: map (builtins.hashFile hash) paths) ["md5" "sha1" "sha256" "sha512"]) diff --git a/tests/lang/eval-okay-hashstring.exp b/tests/lang/eval-okay-hashstring.exp deleted file mode 100644 index d720a082d..000000000 --- a/tests/lang/eval-okay-hashstring.exp +++ /dev/null @@ -1 +0,0 @@ -[ "d41d8cd98f00b204e9800998ecf8427e" "6c69ee7f211c640419d5366cc076ae46" "bb3438fbabd460ea6dbd27d153e2233b" "da39a3ee5e6b4b0d3255bfef95601890afd80709" "cd54e8568c1b37cf1e5badb0779bcbf382212189" "6d12e10b1d331dad210e47fd25d4f260802b7e77" "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" "900a4469df00ccbfd0c145c6d1e4b7953dd0afafadd7534e3a4019e8d38fc663" "ad0387b3bd8652f730ca46d25f9c170af0fd589f42e7f23f5a9e6412d97d7e56" "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" "9d0886f8c6b389398a16257bc79780fab9831c7fc11c8ab07fa732cb7b348feade382f92617c9c5305fefba0af02ab5fd39a587d330997ff5bd0db19f7666653" "21644b72aa259e5a588cd3afbafb1d4310f4889680f6c83b9d531596a5a284f34dbebff409d23bcc86aee6bad10c891606f075c6f4755cb536da27db5693f3a7" ] diff --git a/tests/lang/eval-okay-hashstring.nix b/tests/lang/eval-okay-hashstring.nix deleted file mode 100644 index b0f62b245..000000000 --- a/tests/lang/eval-okay-hashstring.nix +++ /dev/null @@ -1,4 +0,0 @@ -let - strings = [ "" "text 1" "text 2" ]; -in - builtins.concatLists (map (hash: map (builtins.hashString hash) strings) ["md5" "sha1" "sha256" "sha512"]) diff --git a/tests/lang/eval-okay-if.exp b/tests/lang/eval-okay-if.exp deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-if.exp +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-if.nix b/tests/lang/eval-okay-if.nix deleted file mode 100644 index 23e4c74d5..000000000 --- a/tests/lang/eval-okay-if.nix +++ /dev/null @@ -1 +0,0 @@ -if "foo" != "f" + "oo" then 1 else if false then 2 else 3 diff --git a/tests/lang/eval-okay-import.exp b/tests/lang/eval-okay-import.exp deleted file mode 100644 index c508125b5..000000000 --- a/tests/lang/eval-okay-import.exp +++ /dev/null @@ -1 +0,0 @@ -[ 1 2 3 4 5 6 7 8 9 10 ] diff --git a/tests/lang/eval-okay-import.nix b/tests/lang/eval-okay-import.nix deleted file mode 100644 index 0b18d9413..000000000 --- a/tests/lang/eval-okay-import.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - - overrides = { - import = fn: scopedImport overrides fn; - - scopedImport = attrs: fn: scopedImport (overrides // attrs) fn; - - builtins = builtins // overrides; - } // import ./lib.nix; - -in scopedImport overrides ./imported.nix diff --git a/tests/lang/eval-okay-ind-string.exp b/tests/lang/eval-okay-ind-string.exp deleted file mode 100644 index 7862331fa..000000000 --- a/tests/lang/eval-okay-ind-string.exp +++ /dev/null @@ -1 +0,0 @@ -"This is an indented multi-line string\nliteral. An amount of whitespace at\nthe start of each line matching the minimum\nindentation of all lines in the string\nliteral together will be removed. Thus,\nin this case four spaces will be\nstripped from each line, even though\n THIS LINE is indented six spaces.\n\nAlso, empty lines don't count in the\ndetermination of the indentation level (the\nprevious empty line has indentation 0, but\nit doesn't matter).\nIf the string starts with whitespace\n followed by a newline, it's stripped, but\n that's not the case here. Two spaces are\n stripped because of the \" \" at the start. \nThis line is indented\na bit further.\nAnti-quotations, like so, are\nalso allowed.\n The \\ is not special here.\n' can be followed by any character except another ', e.g. 'x'.\nLikewise for $, e.g. $$ or $varName.\nBut ' followed by ' is special, as is $ followed by {.\nIf you want them, use anti-quotations: '', \${.\n Tabs are not interpreted as whitespace (since we can't guess\n what tab settings are intended), so don't use them.\n\tThis line starts with a space and a tab, so only one\n space will be stripped from each line.\nAlso note that if the last line (just before the closing ' ')\nconsists only of whitespace, it's ignored. But here there is\nsome non-whitespace stuff, so the line isn't removed. \nThis shows a hacky way to preserve an empty line after the start.\nBut there's no reason to do so: you could just repeat the empty\nline.\n Similarly you can force an indentation level,\n in this case to 2 spaces. This works because the anti-quote\n is significant (not whitespace).\nstart on network-interfaces\n\nstart script\n\n rm -f /var/run/opengl-driver\n ln -sf 123 /var/run/opengl-driver\n\n rm -f /var/log/slim.log\n \nend script\n\nenv SLIM_CFGFILE=abc\nenv SLIM_THEMESDIR=def\nenv FONTCONFIG_FILE=/etc/fonts/fonts.conf \t\t\t\t# !!! cleanup\nenv XKB_BINDIR=foo/bin \t\t\t\t# Needed for the Xkb extension.\nenv LD_LIBRARY_PATH=libX11/lib:libXext/lib:/usr/lib/ # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)\n\nenv XORG_DRI_DRIVER_PATH=nvidiaDrivers/X11R6/lib/modules/drivers/ \n\nexec slim/bin/slim\nEscaping of ' followed by ': ''\nEscaping of $ followed by {: \${\nAnd finally to interpret \\n etc. as in a string: \n, \r, \t.\nfoo\n'bla'\nbar\ncut -d $'\\t' -f 1\nending dollar $$\n" diff --git a/tests/lang/eval-okay-ind-string.nix b/tests/lang/eval-okay-ind-string.nix deleted file mode 100644 index 95d59b508..000000000 --- a/tests/lang/eval-okay-ind-string.nix +++ /dev/null @@ -1,128 +0,0 @@ -let - - s1 = '' - This is an indented multi-line string - literal. An amount of whitespace at - the start of each line matching the minimum - indentation of all lines in the string - literal together will be removed. Thus, - in this case four spaces will be - stripped from each line, even though - THIS LINE is indented six spaces. - - Also, empty lines don't count in the - determination of the indentation level (the - previous empty line has indentation 0, but - it doesn't matter). - ''; - - s2 = '' If the string starts with whitespace - followed by a newline, it's stripped, but - that's not the case here. Two spaces are - stripped because of the " " at the start. - ''; - - s3 = '' - This line is indented - a bit further. - ''; # indentation of last line doesn't count if it's empty - - s4 = '' - Anti-quotations, like ${if true then "so" else "not so"}, are - also allowed. - ''; - - s5 = '' - The \ is not special here. - ' can be followed by any character except another ', e.g. 'x'. - Likewise for $, e.g. $$ or $varName. - But ' followed by ' is special, as is $ followed by {. - If you want them, use anti-quotations: ${"''"}, ${"\${"}. - ''; - - s6 = '' - Tabs are not interpreted as whitespace (since we can't guess - what tab settings are intended), so don't use them. - This line starts with a space and a tab, so only one - space will be stripped from each line. - ''; - - s7 = '' - Also note that if the last line (just before the closing ' ') - consists only of whitespace, it's ignored. But here there is - some non-whitespace stuff, so the line isn't removed. ''; - - s8 = '' ${""} - This shows a hacky way to preserve an empty line after the start. - But there's no reason to do so: you could just repeat the empty - line. - ''; - - s9 = '' - ${""} Similarly you can force an indentation level, - in this case to 2 spaces. This works because the anti-quote - is significant (not whitespace). - ''; - - s10 = '' - ''; - - s11 = ''''; - - s12 = '' ''; - - s13 = '' - start on network-interfaces - - start script - - rm -f /var/run/opengl-driver - ${if true - then "ln -sf 123 /var/run/opengl-driver" - else if true - then "ln -sf 456 /var/run/opengl-driver" - else "" - } - - rm -f /var/log/slim.log - - end script - - env SLIM_CFGFILE=${"abc"} - env SLIM_THEMESDIR=${"def"} - env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup - env XKB_BINDIR=${"foo"}/bin # Needed for the Xkb extension. - env LD_LIBRARY_PATH=${"libX11"}/lib:${"libXext"}/lib:/usr/lib/ # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz) - - ${if true - then "env XORG_DRI_DRIVER_PATH=${"nvidiaDrivers"}/X11R6/lib/modules/drivers/" - else if true - then "env XORG_DRI_DRIVER_PATH=${"mesa"}/lib/modules/dri" - else "" - } - - exec ${"slim"}/bin/slim - ''; - - s14 = '' - Escaping of ' followed by ': ''' - Escaping of $ followed by {: ''${ - And finally to interpret \n etc. as in a string: ''\n, ''\r, ''\t. - ''; - - # Regression test: string interpolation in '${x}' should work, but didn't. - s15 = let x = "bla"; in '' - foo - '${x}' - bar - ''; - - # Regression test: accept $'. - s16 = '' - cut -d $'\t' -f 1 - ''; - - # Accept dollars at end of strings - s17 = ''ending dollar $'' + ''$'' + "\n"; - -in s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10 + s11 + s12 + s13 + s14 + s15 + s16 + s17 diff --git a/tests/lang/eval-okay-intersectAttrs.exp b/tests/lang/eval-okay-intersectAttrs.exp deleted file mode 100644 index 50445bc0e..000000000 --- a/tests/lang/eval-okay-intersectAttrs.exp +++ /dev/null @@ -1 +0,0 @@ -[ { } { a = 1; } { a = 1; } { a = "a"; } { m = 1; } { m = "m"; } { n = 1; } { n = "n"; } { n = 1; p = 2; } { n = "n"; p = "p"; } { n = 1; p = 2; } { n = "n"; p = "p"; } { a = "a"; b = "b"; c = "c"; d = "d"; e = "e"; f = "f"; g = "g"; h = "h"; i = "i"; j = "j"; k = "k"; l = "l"; m = "m"; n = "n"; o = "o"; p = "p"; q = "q"; r = "r"; s = "s"; t = "t"; u = "u"; v = "v"; w = "w"; x = "x"; y = "y"; z = "z"; } true ] diff --git a/tests/lang/eval-okay-intersectAttrs.nix b/tests/lang/eval-okay-intersectAttrs.nix deleted file mode 100644 index 39d49938c..000000000 --- a/tests/lang/eval-okay-intersectAttrs.nix +++ /dev/null @@ -1,50 +0,0 @@ -let - alphabet = - { a = "a"; - b = "b"; - c = "c"; - d = "d"; - e = "e"; - f = "f"; - g = "g"; - h = "h"; - i = "i"; - j = "j"; - k = "k"; - l = "l"; - m = "m"; - n = "n"; - o = "o"; - p = "p"; - q = "q"; - r = "r"; - s = "s"; - t = "t"; - u = "u"; - v = "v"; - w = "w"; - x = "x"; - y = "y"; - z = "z"; - }; - foo = { - inherit (alphabet) f o b a r z q u x; - aa = throw "aa"; - }; - alphabetFail = builtins.mapAttrs throw alphabet; -in -[ (builtins.intersectAttrs { a = abort "l1"; } { b = abort "r1"; }) - (builtins.intersectAttrs { a = abort "l2"; } { a = 1; }) - (builtins.intersectAttrs alphabetFail { a = 1; }) - (builtins.intersectAttrs { a = abort "laa"; } alphabet) - (builtins.intersectAttrs alphabetFail { m = 1; }) - (builtins.intersectAttrs { m = abort "lam"; } alphabet) - (builtins.intersectAttrs alphabetFail { n = 1; }) - (builtins.intersectAttrs { n = abort "lan"; } alphabet) - (builtins.intersectAttrs alphabetFail { n = 1; p = 2; }) - (builtins.intersectAttrs { n = abort "lan2"; p = abort "lap"; } alphabet) - (builtins.intersectAttrs alphabetFail { n = 1; p = 2; }) - (builtins.intersectAttrs { n = abort "lan2"; p = abort "lap"; } alphabet) - (builtins.intersectAttrs alphabetFail alphabet) - (builtins.intersectAttrs alphabet foo == builtins.intersectAttrs foo alphabet) -] diff --git a/tests/lang/eval-okay-let.exp b/tests/lang/eval-okay-let.exp deleted file mode 100644 index 14e24d419..000000000 --- a/tests/lang/eval-okay-let.exp +++ /dev/null @@ -1 +0,0 @@ -"foobar" diff --git a/tests/lang/eval-okay-let.nix b/tests/lang/eval-okay-let.nix deleted file mode 100644 index fe118c528..000000000 --- a/tests/lang/eval-okay-let.nix +++ /dev/null @@ -1,5 +0,0 @@ -let { - x = "foo"; - y = "bar"; - body = x + y; -} diff --git a/tests/lang/eval-okay-list.exp b/tests/lang/eval-okay-list.exp deleted file mode 100644 index f784f26d8..000000000 --- a/tests/lang/eval-okay-list.exp +++ /dev/null @@ -1 +0,0 @@ -"foobarblatest" diff --git a/tests/lang/eval-okay-list.nix b/tests/lang/eval-okay-list.nix deleted file mode 100644 index d433bcf90..000000000 --- a/tests/lang/eval-okay-list.nix +++ /dev/null @@ -1,7 +0,0 @@ -with import ./lib.nix; - -let { - - body = concat ["foo" "bar" "bla" "test"]; - -}
\ No newline at end of file diff --git a/tests/lang/eval-okay-listtoattrs.exp b/tests/lang/eval-okay-listtoattrs.exp deleted file mode 100644 index 74abef7bc..000000000 --- a/tests/lang/eval-okay-listtoattrs.exp +++ /dev/null @@ -1 +0,0 @@ -"AAbar" diff --git a/tests/lang/eval-okay-listtoattrs.nix b/tests/lang/eval-okay-listtoattrs.nix deleted file mode 100644 index 4186e029b..000000000 --- a/tests/lang/eval-okay-listtoattrs.nix +++ /dev/null @@ -1,11 +0,0 @@ -# this test shows how to use listToAttrs and that evaluation is still lazy (throw isn't called) -with import ./lib.nix; - -let - asi = name: value : { inherit name value; }; - list = [ ( asi "a" "A" ) ( asi "b" "B" ) ]; - a = builtins.listToAttrs list; - 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 diff --git a/tests/lang/eval-okay-logic.exp b/tests/lang/eval-okay-logic.exp deleted file mode 100644 index d00491fd7..000000000 --- a/tests/lang/eval-okay-logic.exp +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/lang/eval-okay-logic.nix b/tests/lang/eval-okay-logic.nix deleted file mode 100644 index fbb127944..000000000 --- a/tests/lang/eval-okay-logic.nix +++ /dev/null @@ -1 +0,0 @@ -assert !false && (true || false) -> true; 1 diff --git a/tests/lang/eval-okay-map.exp b/tests/lang/eval-okay-map.exp deleted file mode 100644 index dbb64f717..000000000 --- a/tests/lang/eval-okay-map.exp +++ /dev/null @@ -1 +0,0 @@ -"foobarblabarxyzzybar" diff --git a/tests/lang/eval-okay-map.nix b/tests/lang/eval-okay-map.nix deleted file mode 100644 index a76c1d811..000000000 --- a/tests/lang/eval-okay-map.nix +++ /dev/null @@ -1,3 +0,0 @@ -with import ./lib.nix; - -concat (map (x: x + "bar") [ "foo" "bla" "xyzzy" ])
\ No newline at end of file diff --git a/tests/lang/eval-okay-mapattrs.exp b/tests/lang/eval-okay-mapattrs.exp deleted file mode 100644 index 3f113f17b..000000000 --- a/tests/lang/eval-okay-mapattrs.exp +++ /dev/null @@ -1 +0,0 @@ -{ x = "x-foo"; y = "y-bar"; } diff --git a/tests/lang/eval-okay-mapattrs.nix b/tests/lang/eval-okay-mapattrs.nix deleted file mode 100644 index f075b6275..000000000 --- a/tests/lang/eval-okay-mapattrs.nix +++ /dev/null @@ -1,3 +0,0 @@ -with import ./lib.nix; - -builtins.mapAttrs (name: value: name + "-" + value) { x = "foo"; y = "bar"; } diff --git a/tests/lang/eval-okay-merge-dynamic-attrs.exp b/tests/lang/eval-okay-merge-dynamic-attrs.exp deleted file mode 100644 index 157d677ce..000000000 --- a/tests/lang/eval-okay-merge-dynamic-attrs.exp +++ /dev/null @@ -1 +0,0 @@ -{ set1 = { a = 1; b = 2; }; set2 = { a = 1; b = 2; }; set3 = { a = 1; b = 2; }; set4 = { a = 1; b = 2; }; } diff --git a/tests/lang/eval-okay-merge-dynamic-attrs.nix b/tests/lang/eval-okay-merge-dynamic-attrs.nix deleted file mode 100644 index f459a554f..000000000 --- a/tests/lang/eval-okay-merge-dynamic-attrs.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - set1 = { a = 1; }; - set1 = { "${"b" + ""}" = 2; }; - - set2 = { "${"b" + ""}" = 2; }; - set2 = { a = 1; }; - - set3.a = 1; - set3."${"b" + ""}" = 2; - - set4."${"b" + ""}" = 2; - set4.a = 1; -} diff --git a/tests/lang/eval-okay-nested-with.exp b/tests/lang/eval-okay-nested-with.exp deleted file mode 100644 index 0cfbf0888..000000000 --- a/tests/lang/eval-okay-nested-with.exp +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/lang/eval-okay-nested-with.nix b/tests/lang/eval-okay-nested-with.nix deleted file mode 100644 index ba9d79aa7..000000000 --- a/tests/lang/eval-okay-nested-with.nix +++ /dev/null @@ -1,3 +0,0 @@ -with { x = 1; }; -with { x = 2; }; -x diff --git a/tests/lang/eval-okay-new-let.exp b/tests/lang/eval-okay-new-let.exp deleted file mode 100644 index f98b38807..000000000 --- a/tests/lang/eval-okay-new-let.exp +++ /dev/null @@ -1 +0,0 @@ -"xyzzyfoobar" diff --git a/tests/lang/eval-okay-new-let.nix b/tests/lang/eval-okay-new-let.nix deleted file mode 100644 index 738123141..000000000 --- a/tests/lang/eval-okay-new-let.nix +++ /dev/null @@ -1,14 +0,0 @@ -let - - f = z: - - let - x = "foo"; - y = "bar"; - body = 1; # compat test - in - z + x + y; - - arg = "xyzzy"; - -in f arg diff --git a/tests/lang/eval-okay-null-dynamic-attrs.exp b/tests/lang/eval-okay-null-dynamic-attrs.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-null-dynamic-attrs.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-null-dynamic-attrs.nix b/tests/lang/eval-okay-null-dynamic-attrs.nix deleted file mode 100644 index b060c0bc9..000000000 --- a/tests/lang/eval-okay-null-dynamic-attrs.nix +++ /dev/null @@ -1 +0,0 @@ -{ ${null} = true; } == {} diff --git a/tests/lang/eval-okay-overrides.exp b/tests/lang/eval-okay-overrides.exp deleted file mode 100644 index 0cfbf0888..000000000 --- a/tests/lang/eval-okay-overrides.exp +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/lang/eval-okay-overrides.nix b/tests/lang/eval-okay-overrides.nix deleted file mode 100644 index 719bdc9c0..000000000 --- a/tests/lang/eval-okay-overrides.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - - overrides = { a = 2; b = 3; }; - -in (rec { - __overrides = overrides; - x = a; - a = 1; -}).x diff --git a/tests/lang/eval-okay-parse-flake-ref.exp b/tests/lang/eval-okay-parse-flake-ref.exp deleted file mode 100644 index fc17ba085..000000000 --- a/tests/lang/eval-okay-parse-flake-ref.exp +++ /dev/null @@ -1 +0,0 @@ -{ dir = "lib"; owner = "NixOS"; ref = "23.05"; repo = "nixpkgs"; type = "github"; } diff --git a/tests/lang/eval-okay-parse-flake-ref.nix b/tests/lang/eval-okay-parse-flake-ref.nix deleted file mode 100644 index db4ed2742..000000000 --- a/tests/lang/eval-okay-parse-flake-ref.nix +++ /dev/null @@ -1 +0,0 @@ - builtins.parseFlakeRef "github:NixOS/nixpkgs/23.05?dir=lib" diff --git a/tests/lang/eval-okay-partition.exp b/tests/lang/eval-okay-partition.exp deleted file mode 100644 index cd8b8b020..000000000 --- a/tests/lang/eval-okay-partition.exp +++ /dev/null @@ -1 +0,0 @@ -{ right = [ 0 2 4 6 8 10 100 102 104 106 108 110 ]; wrong = [ 1 3 5 7 9 101 103 105 107 109 ]; } diff --git a/tests/lang/eval-okay-partition.nix b/tests/lang/eval-okay-partition.nix deleted file mode 100644 index 846d2ce49..000000000 --- a/tests/lang/eval-okay-partition.nix +++ /dev/null @@ -1,5 +0,0 @@ -with import ./lib.nix; - -builtins.partition - (x: x / 2 * 2 == x) - (builtins.concatLists [ (range 0 10) (range 100 110) ]) diff --git a/tests/lang/eval-okay-path-string-interpolation.exp b/tests/lang/eval-okay-path-string-interpolation.exp deleted file mode 100644 index 5b8ea0243..000000000 --- a/tests/lang/eval-okay-path-string-interpolation.exp +++ /dev/null @@ -1 +0,0 @@ -{ absolute = /foo; expr = /pwd/lang/foo/bar; home = /fake-home/foo; notfirst = /pwd/lang/bar/foo; simple = /pwd/lang/foo; slashes = /foo/bar; surrounded = /pwd/lang/a-foo-b; } diff --git a/tests/lang/eval-okay-path-string-interpolation.nix b/tests/lang/eval-okay-path-string-interpolation.nix deleted file mode 100644 index 497d7c1c7..000000000 --- a/tests/lang/eval-okay-path-string-interpolation.nix +++ /dev/null @@ -1,12 +0,0 @@ -let - foo = "foo"; -in -{ - simple = ./${foo}; - surrounded = ./a-${foo}-b; - absolute = /${foo}; - expr = ./${foo + "/bar"}; - home = ~/${foo}; - notfirst = ./bar/${foo}; - slashes = /${foo}/${"bar"}; -} diff --git a/tests/lang/eval-okay-path.exp b/tests/lang/eval-okay-path.exp deleted file mode 100644 index 3ce7f8283..000000000 --- a/tests/lang/eval-okay-path.exp +++ /dev/null @@ -1 +0,0 @@ -"/nix/store/ya937r4ydw0l6kayq8jkyqaips9c75jm-output" diff --git a/tests/lang/eval-okay-path.nix b/tests/lang/eval-okay-path.nix deleted file mode 100644 index e67168cf3..000000000 --- a/tests/lang/eval-okay-path.nix +++ /dev/null @@ -1,7 +0,0 @@ -builtins.path - { path = ./.; - filter = path: _: baseNameOf path == "data"; - recursive = true; - sha256 = "1yhm3gwvg5a41yylymgblsclk95fs6jy72w0wv925mmidlhcq4sw"; - name = "output"; - } diff --git a/tests/lang/eval-okay-pathexists.exp b/tests/lang/eval-okay-pathexists.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-pathexists.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-pathexists.nix b/tests/lang/eval-okay-pathexists.nix deleted file mode 100644 index c5e7a62de..000000000 --- a/tests/lang/eval-okay-pathexists.nix +++ /dev/null @@ -1,29 +0,0 @@ -builtins.pathExists (./lib.nix) -&& builtins.pathExists (builtins.toPath ./lib.nix) -&& builtins.pathExists (builtins.toString ./lib.nix) -&& !builtins.pathExists (builtins.toString ./lib.nix + "/") -&& !builtins.pathExists (builtins.toString ./lib.nix + "/.") -# FIXME -# && !builtins.pathExists (builtins.toString ./lib.nix + "/..") -# && !builtins.pathExists (builtins.toString ./lib.nix + "/a/..") -# && !builtins.pathExists (builtins.toString ./lib.nix + "/../lib.nix") -&& !builtins.pathExists (builtins.toString ./lib.nix + "/./") -&& !builtins.pathExists (builtins.toString ./lib.nix + "/./.") -&& builtins.pathExists (builtins.toString ./.. + "/lang/lib.nix") -&& !builtins.pathExists (builtins.toString ./.. + "lang/lib.nix") -&& builtins.pathExists (builtins.toString ./. + "/../lang/lib.nix") -&& builtins.pathExists (builtins.toString ./. + "/../lang/./lib.nix") -&& builtins.pathExists (builtins.toString ./.) -&& builtins.pathExists (builtins.toString ./. + "/") -&& builtins.pathExists (builtins.toString ./. + "/../lang") -&& builtins.pathExists (builtins.toString ./. + "/../lang/") -&& builtins.pathExists (builtins.toString ./. + "/../lang/.") -&& builtins.pathExists (builtins.toString ./. + "/../lang/./") -&& builtins.pathExists (builtins.toString ./. + "/../lang//./") -&& builtins.pathExists (builtins.toString ./. + "/../lang/..") -&& builtins.pathExists (builtins.toString ./. + "/../lang/../") -&& builtins.pathExists (builtins.toString ./. + "/../lang/..//") -&& builtins.pathExists (builtins.toPath (builtins.toString ./lib.nix)) -&& !builtins.pathExists (builtins.toPath (builtins.toString ./bla.nix)) -&& builtins.pathExists ./lib.nix -&& !builtins.pathExists ./bla.nix diff --git a/tests/lang/eval-okay-patterns.exp b/tests/lang/eval-okay-patterns.exp deleted file mode 100644 index a4304010f..000000000 --- a/tests/lang/eval-okay-patterns.exp +++ /dev/null @@ -1 +0,0 @@ -"abcxyzDDDDEFijk" diff --git a/tests/lang/eval-okay-patterns.nix b/tests/lang/eval-okay-patterns.nix deleted file mode 100644 index 96fd25a01..000000000 --- a/tests/lang/eval-okay-patterns.nix +++ /dev/null @@ -1,16 +0,0 @@ -let - - f = args@{x, y, z}: x + args.y + z; - - g = {x, y, z}@args: f args; - - h = {x ? "d", y ? x, z ? args.x}@args: x + y + z; - - j = {x, y, z, ...}: x + y + z; - -in - f {x = "a"; y = "b"; z = "c";} + - g {x = "x"; y = "y"; z = "z";} + - h {x = "D";} + - h {x = "D"; y = "E"; z = "F";} + - j {x = "i"; y = "j"; z = "k"; bla = "bla"; foo = "bar";} diff --git a/tests/lang/eval-okay-print.err.exp b/tests/lang/eval-okay-print.err.exp deleted file mode 100644 index 3fc99be3e..000000000 --- a/tests/lang/eval-okay-print.err.exp +++ /dev/null @@ -1 +0,0 @@ -trace: [ <CODE> ] diff --git a/tests/lang/eval-okay-print.exp b/tests/lang/eval-okay-print.exp deleted file mode 100644 index 0d960fb70..000000000 --- a/tests/lang/eval-okay-print.exp +++ /dev/null @@ -1 +0,0 @@ -[ null <PRIMOP> <PRIMOP-APP> <LAMBDA> [ [ «repeated» ] ] ] diff --git a/tests/lang/eval-okay-print.nix b/tests/lang/eval-okay-print.nix deleted file mode 100644 index d36ba4da3..000000000 --- a/tests/lang/eval-okay-print.nix +++ /dev/null @@ -1 +0,0 @@ -with builtins; trace [(1+1)] [ null toString (deepSeq "x") (a: a) (let x=[x]; in x) ] diff --git a/tests/lang/eval-okay-readDir.exp b/tests/lang/eval-okay-readDir.exp deleted file mode 100644 index 6413f6d4f..000000000 --- a/tests/lang/eval-okay-readDir.exp +++ /dev/null @@ -1 +0,0 @@ -{ bar = "regular"; foo = "directory"; ldir = "symlink"; linked = "symlink"; } diff --git a/tests/lang/eval-okay-readDir.nix b/tests/lang/eval-okay-readDir.nix deleted file mode 100644 index a7ec9292a..000000000 --- a/tests/lang/eval-okay-readDir.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.readDir ./readDir diff --git a/tests/lang/eval-okay-readFileType.exp b/tests/lang/eval-okay-readFileType.exp deleted file mode 100644 index 6413f6d4f..000000000 --- a/tests/lang/eval-okay-readFileType.exp +++ /dev/null @@ -1 +0,0 @@ -{ bar = "regular"; foo = "directory"; ldir = "symlink"; linked = "symlink"; } diff --git a/tests/lang/eval-okay-readFileType.nix b/tests/lang/eval-okay-readFileType.nix deleted file mode 100644 index 174fb6c3a..000000000 --- a/tests/lang/eval-okay-readFileType.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - bar = builtins.readFileType ./readDir/bar; - foo = builtins.readFileType ./readDir/foo; - linked = builtins.readFileType ./readDir/linked; - ldir = builtins.readFileType ./readDir/ldir; -} diff --git a/tests/lang/eval-okay-readfile.exp b/tests/lang/eval-okay-readfile.exp deleted file mode 100644 index a2c87d0c4..000000000 --- a/tests/lang/eval-okay-readfile.exp +++ /dev/null @@ -1 +0,0 @@ -"builtins.readFile ./eval-okay-readfile.nix\n" diff --git a/tests/lang/eval-okay-readfile.nix b/tests/lang/eval-okay-readfile.nix deleted file mode 100644 index 82f7cb174..000000000 --- a/tests/lang/eval-okay-readfile.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.readFile ./eval-okay-readfile.nix diff --git a/tests/lang/eval-okay-redefine-builtin.exp b/tests/lang/eval-okay-redefine-builtin.exp deleted file mode 100644 index c508d5366..000000000 --- a/tests/lang/eval-okay-redefine-builtin.exp +++ /dev/null @@ -1 +0,0 @@ -false diff --git a/tests/lang/eval-okay-redefine-builtin.nix b/tests/lang/eval-okay-redefine-builtin.nix deleted file mode 100644 index df9fc3f37..000000000 --- a/tests/lang/eval-okay-redefine-builtin.nix +++ /dev/null @@ -1,3 +0,0 @@ -let - throw = abort "Error!"; -in (builtins.tryEval <foobaz>).success diff --git a/tests/lang/eval-okay-regex-match.exp b/tests/lang/eval-okay-regex-match.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-regex-match.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-regex-match.nix b/tests/lang/eval-okay-regex-match.nix deleted file mode 100644 index 273e25907..000000000 --- a/tests/lang/eval-okay-regex-match.nix +++ /dev/null @@ -1,29 +0,0 @@ -with builtins; - -let - - matches = pat: s: match pat s != null; - - splitFN = match "((.*)/)?([^/]*)\\.(nix|cc)"; - -in - -assert matches "foobar" "foobar"; -assert matches "fo*" "f"; -assert !matches "fo+" "f"; -assert matches "fo*" "fo"; -assert matches "fo*" "foo"; -assert matches "fo+" "foo"; -assert matches "fo{1,2}" "foo"; -assert !matches "fo{1,2}" "fooo"; -assert !matches "fo*" "foobar"; -assert matches "[[:space:]]+([^[:space:]]+)[[:space:]]+" " foo "; -assert !matches "[[:space:]]+([[:upper:]]+)[[:space:]]+" " foo "; - -assert match "(.*)\\.nix" "foobar.nix" == [ "foobar" ]; -assert match "[[:space:]]+([[:upper:]]+)[[:space:]]+" " FOO " == [ "FOO" ]; - -assert splitFN "/path/to/foobar.nix" == [ "/path/to/" "/path/to" "foobar" "nix" ]; -assert splitFN "foobar.cc" == [ null null "foobar" "cc" ]; - -true diff --git a/tests/lang/eval-okay-regex-split.exp b/tests/lang/eval-okay-regex-split.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-regex-split.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-regex-split.nix b/tests/lang/eval-okay-regex-split.nix deleted file mode 100644 index 0073e0577..000000000 --- a/tests/lang/eval-okay-regex-split.nix +++ /dev/null @@ -1,48 +0,0 @@ -with builtins; - -# Non capturing regex returns empty lists -assert split "foobar" "foobar" == ["" [] ""]; -assert split "fo*" "f" == ["" [] ""]; -assert split "fo+" "f" == ["f"]; -assert split "fo*" "fo" == ["" [] ""]; -assert split "fo*" "foo" == ["" [] ""]; -assert split "fo+" "foo" == ["" [] ""]; -assert split "fo{1,2}" "foo" == ["" [] ""]; -assert split "fo{1,2}" "fooo" == ["" [] "o"]; -assert split "fo*" "foobar" == ["" [] "bar"]; - -# Capturing regex returns a list of sub-matches -assert split "(fo*)" "f" == ["" ["f"] ""]; -assert split "(fo+)" "f" == ["f"]; -assert split "(fo*)" "fo" == ["" ["fo"] ""]; -assert split "(f)(o*)" "f" == ["" ["f" ""] ""]; -assert split "(f)(o*)" "foo" == ["" ["f" "oo"] ""]; -assert split "(fo+)" "foo" == ["" ["foo"] ""]; -assert split "(fo{1,2})" "foo" == ["" ["foo"] ""]; -assert split "(fo{1,2})" "fooo" == ["" ["foo"] "o"]; -assert split "(fo*)" "foobar" == ["" ["foo"] "bar"]; - -# Matches are greedy. -assert split "(o+)" "oooofoooo" == ["" ["oooo"] "f" ["oooo"] ""]; - -# Matches multiple times. -assert split "(b)" "foobarbaz" == ["foo" ["b"] "ar" ["b"] "az"]; - -# Split large strings containing newlines. null are inserted when a -# pattern within the current did not match anything. -assert split "[[:space:]]+|([',.!?])" '' - Nix Rocks! - That's why I use it. -'' == [ - "Nix" [ null ] "Rocks" ["!"] "" [ null ] - "That" ["'"] "s" [ null ] "why" [ null ] "I" [ null ] "use" [ null ] "it" ["."] "" [ null ] - "" -]; - -# Documentation examples -assert split "(a)b" "abc" == [ "" [ "a" ] "c" ]; -assert split "([ac])" "abc" == [ "" [ "a" ] "b" [ "c" ] "" ]; -assert split "(a)|(c)" "abc" == [ "" [ "a" null ] "b" [ null "c" ] "" ]; -assert split "([[:upper:]]+)" " FOO " == [ " " [ "FOO" ] " " ]; - -true diff --git a/tests/lang/eval-okay-regression-20220122.exp b/tests/lang/eval-okay-regression-20220122.exp deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-regression-20220122.exp +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-regression-20220122.nix b/tests/lang/eval-okay-regression-20220122.nix deleted file mode 100644 index 694e9a13b..000000000 --- a/tests/lang/eval-okay-regression-20220122.nix +++ /dev/null @@ -1 +0,0 @@ -((_: _) 1) + ((__: __) 2) diff --git a/tests/lang/eval-okay-regression-20220125.exp b/tests/lang/eval-okay-regression-20220125.exp deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-regression-20220125.exp +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-regression-20220125.nix b/tests/lang/eval-okay-regression-20220125.nix deleted file mode 100644 index 485502373..000000000 --- a/tests/lang/eval-okay-regression-20220125.nix +++ /dev/null @@ -1,2 +0,0 @@ -((__curPosFoo: __curPosFoo) 1) + ((__curPosBar: __curPosBar) 2) - diff --git a/tests/lang/eval-okay-remove.exp b/tests/lang/eval-okay-remove.exp deleted file mode 100644 index 8d38505c1..000000000 --- a/tests/lang/eval-okay-remove.exp +++ /dev/null @@ -1 +0,0 @@ -456 diff --git a/tests/lang/eval-okay-remove.nix b/tests/lang/eval-okay-remove.nix deleted file mode 100644 index 4ad5ba897..000000000 --- a/tests/lang/eval-okay-remove.nix +++ /dev/null @@ -1,5 +0,0 @@ -let { - attrs = {x = 123; y = 456;}; - - body = (removeAttrs attrs ["x"]).y; -}
\ No newline at end of file diff --git a/tests/lang/eval-okay-replacestrings.exp b/tests/lang/eval-okay-replacestrings.exp deleted file mode 100644 index eac67c5fe..000000000 --- a/tests/lang/eval-okay-replacestrings.exp +++ /dev/null @@ -1 +0,0 @@ -[ "faabar" "fbar" "fubar" "faboor" "fubar" "XaXbXcX" "X" "a_b" "fubar" ] diff --git a/tests/lang/eval-okay-replacestrings.nix b/tests/lang/eval-okay-replacestrings.nix deleted file mode 100644 index a803e6519..000000000 --- a/tests/lang/eval-okay-replacestrings.nix +++ /dev/null @@ -1,12 +0,0 @@ -with builtins; - -[ (replaceStrings ["o"] ["a"] "foobar") - (replaceStrings ["o"] [""] "foobar") - (replaceStrings ["oo"] ["u"] "foobar") - (replaceStrings ["oo" "a"] ["a" "oo"] "foobar") - (replaceStrings ["oo" "oo"] ["u" "i"] "foobar") - (replaceStrings [""] ["X"] "abc") - (replaceStrings [""] ["X"] "") - (replaceStrings ["-"] ["_"] "a-b") - (replaceStrings ["oo" "XX"] ["u" (throw "unreachable")] "foobar") -] diff --git a/tests/lang/eval-okay-scope-1.exp b/tests/lang/eval-okay-scope-1.exp deleted file mode 100644 index 00750edc0..000000000 --- a/tests/lang/eval-okay-scope-1.exp +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/tests/lang/eval-okay-scope-1.nix b/tests/lang/eval-okay-scope-1.nix deleted file mode 100644 index fa38a7174..000000000 --- a/tests/lang/eval-okay-scope-1.nix +++ /dev/null @@ -1,6 +0,0 @@ -(({x}: x: - - { x = 1; - y = x; - } -) {x = 2;} 3).y diff --git a/tests/lang/eval-okay-scope-2.exp b/tests/lang/eval-okay-scope-2.exp deleted file mode 100644 index d00491fd7..000000000 --- a/tests/lang/eval-okay-scope-2.exp +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/lang/eval-okay-scope-2.nix b/tests/lang/eval-okay-scope-2.nix deleted file mode 100644 index eb8b02bc4..000000000 --- a/tests/lang/eval-okay-scope-2.nix +++ /dev/null @@ -1,6 +0,0 @@ -((x: {x}: - rec { - x = 1; - y = x; - } -) 2 {x = 3;}).y diff --git a/tests/lang/eval-okay-scope-3.exp b/tests/lang/eval-okay-scope-3.exp deleted file mode 100644 index b8626c4cf..000000000 --- a/tests/lang/eval-okay-scope-3.exp +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/tests/lang/eval-okay-scope-3.nix b/tests/lang/eval-okay-scope-3.nix deleted file mode 100644 index 10d6bc04d..000000000 --- a/tests/lang/eval-okay-scope-3.nix +++ /dev/null @@ -1,6 +0,0 @@ -((x: as: {x}: - rec { - inherit (as) x; - y = x; - } -) 2 {x = 4;} {x = 3;}).y diff --git a/tests/lang/eval-okay-scope-4.exp b/tests/lang/eval-okay-scope-4.exp deleted file mode 100644 index 00ff03a46..000000000 --- a/tests/lang/eval-okay-scope-4.exp +++ /dev/null @@ -1 +0,0 @@ -"ccdd" diff --git a/tests/lang/eval-okay-scope-4.nix b/tests/lang/eval-okay-scope-4.nix deleted file mode 100644 index dc8243bc8..000000000 --- a/tests/lang/eval-okay-scope-4.nix +++ /dev/null @@ -1,10 +0,0 @@ -let { - - x = "a"; - y = "b"; - - f = {x ? y, y ? x}: x + y; - - body = f {x = "c";} + f {y = "d";}; - -} diff --git a/tests/lang/eval-okay-scope-6.exp b/tests/lang/eval-okay-scope-6.exp deleted file mode 100644 index 00ff03a46..000000000 --- a/tests/lang/eval-okay-scope-6.exp +++ /dev/null @@ -1 +0,0 @@ -"ccdd" diff --git a/tests/lang/eval-okay-scope-6.nix b/tests/lang/eval-okay-scope-6.nix deleted file mode 100644 index 0995d4e7e..000000000 --- a/tests/lang/eval-okay-scope-6.nix +++ /dev/null @@ -1,7 +0,0 @@ -let { - - f = {x ? y, y ? x}: x + y; - - body = f {x = "c";} + f {y = "d";}; - -} diff --git a/tests/lang/eval-okay-scope-7.exp b/tests/lang/eval-okay-scope-7.exp deleted file mode 100644 index d00491fd7..000000000 --- a/tests/lang/eval-okay-scope-7.exp +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/lang/eval-okay-scope-7.nix b/tests/lang/eval-okay-scope-7.nix deleted file mode 100644 index 4da02968f..000000000 --- a/tests/lang/eval-okay-scope-7.nix +++ /dev/null @@ -1,6 +0,0 @@ -rec { - inherit (x) y; - x = { - y = 1; - }; -}.y diff --git a/tests/lang/eval-okay-search-path.exp b/tests/lang/eval-okay-search-path.exp deleted file mode 100644 index 4519bc406..000000000 --- a/tests/lang/eval-okay-search-path.exp +++ /dev/null @@ -1 +0,0 @@ -"abccX" diff --git a/tests/lang/eval-okay-search-path.flags b/tests/lang/eval-okay-search-path.flags deleted file mode 100644 index dfad1c611..000000000 --- a/tests/lang/eval-okay-search-path.flags +++ /dev/null @@ -1 +0,0 @@ --I lang/dir1 -I lang/dir2 -I dir5=lang/dir3 diff --git a/tests/lang/eval-okay-search-path.nix b/tests/lang/eval-okay-search-path.nix deleted file mode 100644 index 6fe33decc..000000000 --- a/tests/lang/eval-okay-search-path.nix +++ /dev/null @@ -1,10 +0,0 @@ -with import ./lib.nix; -with builtins; - -assert isFunction (import <nix/fetchurl.nix>); - -assert length __nixPath == 5; -assert length (filter (x: baseNameOf x.path == "dir4") __nixPath) == 1; - -import <a.nix> + import <b.nix> + import <c.nix> + import <dir5/c.nix> - + (let __nixPath = [ { path = ./dir2; } { path = ./dir1; } ]; in import <a.nix>) diff --git a/tests/lang/eval-okay-seq.exp b/tests/lang/eval-okay-seq.exp deleted file mode 100644 index 0cfbf0888..000000000 --- a/tests/lang/eval-okay-seq.exp +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tests/lang/eval-okay-seq.nix b/tests/lang/eval-okay-seq.nix deleted file mode 100644 index 0a9a21c03..000000000 --- a/tests/lang/eval-okay-seq.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.seq 1 2 diff --git a/tests/lang/eval-okay-sort.exp b/tests/lang/eval-okay-sort.exp deleted file mode 100644 index 899119e20..000000000 --- a/tests/lang/eval-okay-sort.exp +++ /dev/null @@ -1 +0,0 @@ -[ [ 42 77 147 249 483 526 ] [ 526 483 249 147 77 42 ] [ "bar" "fnord" "foo" "xyzzy" ] [ { key = 1; value = "foo"; } { key = 1; value = "fnord"; } { key = 2; value = "bar"; } ] [ [ ] [ ] [ 1 ] [ 1 4 ] [ 1 5 ] [ 1 6 ] [ 2 ] [ 2 3 ] [ 3 ] [ 3 ] ] ] diff --git a/tests/lang/eval-okay-sort.nix b/tests/lang/eval-okay-sort.nix deleted file mode 100644 index 50aa78e40..000000000 --- a/tests/lang/eval-okay-sort.nix +++ /dev/null @@ -1,20 +0,0 @@ -with builtins; - -[ (sort lessThan [ 483 249 526 147 42 77 ]) - (sort (x: y: y < x) [ 483 249 526 147 42 77 ]) - (sort lessThan [ "foo" "bar" "xyzzy" "fnord" ]) - (sort (x: y: x.key < y.key) - [ { key = 1; value = "foo"; } { key = 2; value = "bar"; } { key = 1; value = "fnord"; } ]) - (sort lessThan [ - [ 1 6 ] - [ ] - [ 2 3 ] - [ 3 ] - [ 1 5 ] - [ 2 ] - [ 1 ] - [ ] - [ 1 4 ] - [ 3 ] - ]) -] diff --git a/tests/lang/eval-okay-splitversion.exp b/tests/lang/eval-okay-splitversion.exp deleted file mode 100644 index 153ceb818..000000000 --- a/tests/lang/eval-okay-splitversion.exp +++ /dev/null @@ -1 +0,0 @@ -[ "1" "2" "3" ] diff --git a/tests/lang/eval-okay-splitversion.nix b/tests/lang/eval-okay-splitversion.nix deleted file mode 100644 index 9e5c99d2e..000000000 --- a/tests/lang/eval-okay-splitversion.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.splitVersion "1.2.3" diff --git a/tests/lang/eval-okay-string.exp b/tests/lang/eval-okay-string.exp deleted file mode 100644 index 63f650f73..000000000 --- a/tests/lang/eval-okay-string.exp +++ /dev/null @@ -1 +0,0 @@ -"foobar/a/b/c/d/foo/xyzzy/foo.txt/../foo/x/yescape: \"quote\" \n \\end\nof\nlinefoobarblaatfoo$bar$\"$\"$" diff --git a/tests/lang/eval-okay-string.nix b/tests/lang/eval-okay-string.nix deleted file mode 100644 index 47cc989ad..000000000 --- a/tests/lang/eval-okay-string.nix +++ /dev/null @@ -1,12 +0,0 @@ -"foo" + "bar" - + toString (/a/b + /c/d) - + toString (/foo/bar + "/../xyzzy/." + "/foo.txt") - + ("/../foo" + toString /x/y) - + "escape: \"quote\" \n \\" - + "end -of -line" - + "foo${if true then "b${"a" + "r"}" else "xyzzy"}blaat" - + "foo$bar" - + "$\"$\"" - + "$" diff --git a/tests/lang/eval-okay-strings-as-attrs-names.exp b/tests/lang/eval-okay-strings-as-attrs-names.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-strings-as-attrs-names.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-strings-as-attrs-names.nix b/tests/lang/eval-okay-strings-as-attrs-names.nix deleted file mode 100644 index 5e40928db..000000000 --- a/tests/lang/eval-okay-strings-as-attrs-names.nix +++ /dev/null @@ -1,20 +0,0 @@ -let - - attr = { - "key 1" = "test"; - "key 2" = "caseok"; - }; - - t1 = builtins.getAttr "key 1" attr; - t2 = attr."key 2"; - t3 = attr ? "key 1"; - t4 = builtins.attrNames { inherit (attr) "key 1"; }; - - # This is permitted, but there is currently no way to reference this - # variable. - "foo bar" = 1; - -in t1 == "test" - && t2 == "caseok" - && t3 == true - && t4 == ["key 1"] diff --git a/tests/lang/eval-okay-substring.exp b/tests/lang/eval-okay-substring.exp deleted file mode 100644 index 6aace04b0..000000000 --- a/tests/lang/eval-okay-substring.exp +++ /dev/null @@ -1 +0,0 @@ -"ooxfoobarybarzobaabbc" diff --git a/tests/lang/eval-okay-substring.nix b/tests/lang/eval-okay-substring.nix deleted file mode 100644 index 424af00d9..000000000 --- a/tests/lang/eval-okay-substring.nix +++ /dev/null @@ -1,21 +0,0 @@ -with builtins; - -let - - s = "foobar"; - -in - -substring 1 2 s -+ "x" -+ substring 0 (stringLength s) s -+ "y" -+ substring 3 100 s -+ "z" -+ substring 2 (sub (stringLength s) 3) s -+ "a" -+ substring 3 0 s -+ "b" -+ substring 3 1 s -+ "c" -+ substring 5 10 "perl" diff --git a/tests/lang/eval-okay-tail-call-1.exp-disabled b/tests/lang/eval-okay-tail-call-1.exp-disabled deleted file mode 100644 index f7393e847..000000000 --- a/tests/lang/eval-okay-tail-call-1.exp-disabled +++ /dev/null @@ -1 +0,0 @@ -100000 diff --git a/tests/lang/eval-okay-tail-call-1.nix b/tests/lang/eval-okay-tail-call-1.nix deleted file mode 100644 index a3962ce3f..000000000 --- a/tests/lang/eval-okay-tail-call-1.nix +++ /dev/null @@ -1,3 +0,0 @@ -let - f = n: if n == 100000 then n else f (n + 1); -in f 0 diff --git a/tests/lang/eval-okay-tojson.exp b/tests/lang/eval-okay-tojson.exp deleted file mode 100644 index e92aae323..000000000 --- a/tests/lang/eval-okay-tojson.exp +++ /dev/null @@ -1 +0,0 @@ -"{\"a\":123,\"b\":-456,\"c\":\"foo\",\"d\":\"foo\\n\\\"bar\\\"\",\"e\":true,\"f\":false,\"g\":[1,2,3],\"h\":[\"a\",[\"b\",{\"foo\\nbar\":{}}]],\"i\":3,\"j\":1.44,\"k\":\"foo\"}" diff --git a/tests/lang/eval-okay-tojson.nix b/tests/lang/eval-okay-tojson.nix deleted file mode 100644 index ce67943be..000000000 --- a/tests/lang/eval-okay-tojson.nix +++ /dev/null @@ -1,13 +0,0 @@ -builtins.toJSON - { a = 123; - b = -456; - c = "foo"; - d = "foo\n\"bar\""; - e = true; - f = false; - g = [ 1 2 3 ]; - h = [ "a" [ "b" { "foo\nbar" = {}; } ] ]; - i = 1 + 2; - j = 1.44; - k = { __toString = self: self.a; a = "foo"; }; - } diff --git a/tests/lang/eval-okay-toxml.exp b/tests/lang/eval-okay-toxml.exp deleted file mode 100644 index 828220890..000000000 --- a/tests/lang/eval-okay-toxml.exp +++ /dev/null @@ -1 +0,0 @@ -"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n <attrs>\n <attr name=\"a\">\n <string value=\"s\" />\n </attr>\n </attrs>\n</expr>\n" diff --git a/tests/lang/eval-okay-toxml.nix b/tests/lang/eval-okay-toxml.nix deleted file mode 100644 index 068c97a6c..000000000 --- a/tests/lang/eval-okay-toxml.nix +++ /dev/null @@ -1,3 +0,0 @@ -# Make sure the expected XML output is produced; in particular, make sure it -# doesn't contain source location information. -builtins.toXML { a = "s"; } diff --git a/tests/lang/eval-okay-toxml2.exp b/tests/lang/eval-okay-toxml2.exp deleted file mode 100644 index 634a841eb..000000000 --- a/tests/lang/eval-okay-toxml2.exp +++ /dev/null @@ -1 +0,0 @@ -"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n <list>\n <string value=\"ab\" />\n <int value=\"10\" />\n <attrs>\n <attr name=\"x\">\n <string value=\"x\" />\n </attr>\n <attr name=\"y\">\n <string value=\"x\" />\n </attr>\n </attrs>\n </list>\n</expr>\n" diff --git a/tests/lang/eval-okay-toxml2.nix b/tests/lang/eval-okay-toxml2.nix deleted file mode 100644 index ff1791b30..000000000 --- a/tests/lang/eval-okay-toxml2.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.toXML [("a" + "b") 10 (rec {x = "x"; y = x;})] diff --git a/tests/lang/eval-okay-tryeval.exp b/tests/lang/eval-okay-tryeval.exp deleted file mode 100644 index 2b2e6fa71..000000000 --- a/tests/lang/eval-okay-tryeval.exp +++ /dev/null @@ -1 +0,0 @@ -{ x = { success = true; value = "x"; }; y = { success = false; value = false; }; z = { success = false; value = false; }; } diff --git a/tests/lang/eval-okay-tryeval.nix b/tests/lang/eval-okay-tryeval.nix deleted file mode 100644 index 629bc440a..000000000 --- a/tests/lang/eval-okay-tryeval.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - x = builtins.tryEval "x"; - y = builtins.tryEval (assert false; "y"); - z = builtins.tryEval (throw "bla"); -} diff --git a/tests/lang/eval-okay-types.exp b/tests/lang/eval-okay-types.exp deleted file mode 100644 index 92a153299..000000000 --- a/tests/lang/eval-okay-types.exp +++ /dev/null @@ -1 +0,0 @@ -[ true false true false true false true false true true true true true true true true true true true false true true true false "int" "bool" "string" "null" "set" "list" "lambda" "lambda" "lambda" "lambda" ] diff --git a/tests/lang/eval-okay-types.nix b/tests/lang/eval-okay-types.nix deleted file mode 100644 index 9b58be5d1..000000000 --- a/tests/lang/eval-okay-types.nix +++ /dev/null @@ -1,37 +0,0 @@ -with builtins; - -[ (isNull null) - (isNull (x: x)) - (isFunction (x: x)) - (isFunction "fnord") - (isString ("foo" + "bar")) - (isString [ "x" ]) - (isInt (1 + 2)) - (isInt { x = 123; }) - (isInt (1 / 2)) - (isInt (1 + 1)) - (isInt (1 / 2)) - (isInt (1 * 2)) - (isInt (1 - 2)) - (isFloat (1.2)) - (isFloat (1 + 1.0)) - (isFloat (1 / 2.0)) - (isFloat (1 * 2.0)) - (isFloat (1 - 2.0)) - (isBool (true && false)) - (isBool null) - (isPath /nix/store) - (isPath ./.) - (isAttrs { x = 123; }) - (isAttrs null) - (typeOf (3 * 4)) - (typeOf true) - (typeOf "xyzzy") - (typeOf null) - (typeOf { x = 456; }) - (typeOf [ 1 2 3 ]) - (typeOf (x: x)) - (typeOf ((x: y: x) 1)) - (typeOf map) - (typeOf (map (x: x))) -] diff --git a/tests/lang/eval-okay-versions.exp b/tests/lang/eval-okay-versions.exp deleted file mode 100644 index 27ba77dda..000000000 --- a/tests/lang/eval-okay-versions.exp +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/lang/eval-okay-versions.nix b/tests/lang/eval-okay-versions.nix deleted file mode 100644 index e9111f5f4..000000000 --- a/tests/lang/eval-okay-versions.nix +++ /dev/null @@ -1,43 +0,0 @@ -let - - name1 = "hello-1.0.2"; - name2 = "hello"; - name3 = "915resolution-0.5.2"; - name4 = "xf86-video-i810-1.7.4"; - name5 = "name-that-ends-with-dash--1.0"; - - eq = 0; - lt = builtins.sub 0 1; - gt = 1; - - versionTest = v1: v2: expected: - let d1 = builtins.compareVersions v1 v2; - d2 = builtins.compareVersions v2 v1; - in d1 == builtins.sub 0 d2 && d1 == expected; - - tests = [ - ((builtins.parseDrvName name1).name == "hello") - ((builtins.parseDrvName name1).version == "1.0.2") - ((builtins.parseDrvName name2).name == "hello") - ((builtins.parseDrvName name2).version == "") - ((builtins.parseDrvName name3).name == "915resolution") - ((builtins.parseDrvName name3).version == "0.5.2") - ((builtins.parseDrvName name4).name == "xf86-video-i810") - ((builtins.parseDrvName name4).version == "1.7.4") - ((builtins.parseDrvName name5).name == "name-that-ends-with-dash") - ((builtins.parseDrvName name5).version == "-1.0") - (versionTest "1.0" "2.3" lt) - (versionTest "2.1" "2.3" lt) - (versionTest "2.3" "2.3" eq) - (versionTest "2.5" "2.3" gt) - (versionTest "3.1" "2.3" gt) - (versionTest "2.3.1" "2.3" gt) - (versionTest "2.3.1" "2.3a" gt) - (versionTest "2.3pre1" "2.3" lt) - (versionTest "2.3pre3" "2.3pre12" lt) - (versionTest "2.3a" "2.3c" lt) - (versionTest "2.3pre1" "2.3c" lt) - (versionTest "2.3pre1" "2.3q" lt) - ]; - -in (import ./lib.nix).and tests diff --git a/tests/lang/eval-okay-with.exp b/tests/lang/eval-okay-with.exp deleted file mode 100644 index 378c8dc80..000000000 --- a/tests/lang/eval-okay-with.exp +++ /dev/null @@ -1 +0,0 @@ -"xyzzybarxyzzybar" diff --git a/tests/lang/eval-okay-with.nix b/tests/lang/eval-okay-with.nix deleted file mode 100644 index 033e8d3ab..000000000 --- a/tests/lang/eval-okay-with.nix +++ /dev/null @@ -1,19 +0,0 @@ -let { - - a = "xyzzy"; - - as = { - a = "foo"; - b = "bar"; - }; - - bs = { - a = "bar"; - }; - - x = with as; a + b; - - y = with as; with bs; a + b; - - body = x + y; -} diff --git a/tests/lang/eval-okay-xml.exp.xml b/tests/lang/eval-okay-xml.exp.xml deleted file mode 100644 index 20099326c..000000000 --- a/tests/lang/eval-okay-xml.exp.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<expr> - <attrs> - <attr name="a"> - <string value="foo" /> - </attr> - <attr name="at"> - <function> - <attrspat name="args"> - <attr name="x" /> - <attr name="y" /> - <attr name="z" /> - </attrspat> - </function> - </attr> - <attr name="b"> - <string value="bar" /> - </attr> - <attr name="c"> - <string value="foobar" /> - </attr> - <attr name="ellipsis"> - <function> - <attrspat ellipsis="1"> - <attr name="x" /> - <attr name="y" /> - <attr name="z" /> - </attrspat> - </function> - </attr> - <attr name="f"> - <function> - <attrspat> - <attr name="x" /> - <attr name="y" /> - <attr name="z" /> - </attrspat> - </function> - </attr> - <attr name="id"> - <function> - <varpat name="x" /> - </function> - </attr> - <attr name="x"> - <int value="123" /> - </attr> - <attr name="y"> - <float value="567.89" /> - </attr> - </attrs> -</expr> diff --git a/tests/lang/eval-okay-xml.nix b/tests/lang/eval-okay-xml.nix deleted file mode 100644 index 9ee9f8a0b..000000000 --- a/tests/lang/eval-okay-xml.nix +++ /dev/null @@ -1,21 +0,0 @@ -rec { - - x = 123; - - y = 567.890; - - a = "foo"; - - b = "bar"; - - c = "foo" + "bar"; - - f = {z, x, y}: if y then x else z; - - id = x: x; - - at = args@{x, y, z}: x; - - ellipsis = {x, y, z, ...}: x; - -} diff --git a/tests/lang/eval-okay-zipAttrsWith.exp b/tests/lang/eval-okay-zipAttrsWith.exp deleted file mode 100644 index 9c0b15d22..000000000 --- a/tests/lang/eval-okay-zipAttrsWith.exp +++ /dev/null @@ -1 +0,0 @@ -{ "0" = { n = "0"; v = [ 5 23 29 ]; }; "1" = { n = "1"; v = [ 7 30 ]; }; "2" = { n = "2"; v = [ 18 ]; }; "4" = { n = "4"; v = [ 10 ]; }; "5" = { n = "5"; v = [ 15 25 26 31 ]; }; "6" = { n = "6"; v = [ 3 14 ]; }; "7" = { n = "7"; v = [ 12 ]; }; "8" = { n = "8"; v = [ 2 6 8 9 ]; }; "9" = { n = "9"; v = [ 0 16 ]; }; a = { n = "a"; v = [ 17 21 22 27 ]; }; c = { n = "c"; v = [ 11 24 ]; }; d = { n = "d"; v = [ 4 13 28 ]; }; e = { n = "e"; v = [ 20 ]; }; f = { n = "f"; v = [ 1 19 ]; }; } diff --git a/tests/lang/eval-okay-zipAttrsWith.nix b/tests/lang/eval-okay-zipAttrsWith.nix deleted file mode 100644 index 877d4e5fa..000000000 --- a/tests/lang/eval-okay-zipAttrsWith.nix +++ /dev/null @@ -1,9 +0,0 @@ -with import ./lib.nix; - -let - str = builtins.hashString "sha256" "test"; -in -builtins.zipAttrsWith - (n: v: { inherit n v; }) - (map (n: { ${builtins.substring n 1 str} = n; }) - (range 0 31)) diff --git a/tests/lang/framework.sh b/tests/lang/framework.sh deleted file mode 100644 index 516bff8ad..000000000 --- a/tests/lang/framework.sh +++ /dev/null @@ -1,33 +0,0 @@ -# Golden test support -# -# Test that the output of the given test matches what is expected. If -# `_NIX_TEST_ACCEPT` is non-empty also update the expected output so -# that next time the test succeeds. -function diffAndAcceptInner() { - local -r testName=$1 - local -r got="$2" - local -r expected="$3" - - # Absence of expected file indicates empty output expected. - if test -e "$expected"; then - local -r expectedOrEmpty="$expected" - else - local -r expectedOrEmpty=lang/empty.exp - fi - - # Diff so we get a nice message - if ! diff --unified "$got" "$expectedOrEmpty"; then - echo "FAIL: evaluation result of $testName not as expected" - badDiff=1 - fi - - # Update expected if `_NIX_TEST_ACCEPT` is non-empty. - if test -n "${_NIX_TEST_ACCEPT-}"; then - cp "$got" "$expected" - # Delete empty expected files to avoid bloating the repo with - # empty files. - if ! test -s "$expected"; then - rm "$expected" - fi - fi -} diff --git a/tests/lang/imported.nix b/tests/lang/imported.nix deleted file mode 100644 index fb39ee4ef..000000000 --- a/tests/lang/imported.nix +++ /dev/null @@ -1,3 +0,0 @@ -# The function ‘range’ comes from lib.nix and was added to the lexical -# scope by scopedImport. -range 1 5 ++ import ./imported2.nix diff --git a/tests/lang/imported2.nix b/tests/lang/imported2.nix deleted file mode 100644 index 6d0a2992b..000000000 --- a/tests/lang/imported2.nix +++ /dev/null @@ -1 +0,0 @@ -range 6 10 diff --git a/tests/lang/lib.nix b/tests/lang/lib.nix deleted file mode 100644 index 028a53831..000000000 --- a/tests/lang/lib.nix +++ /dev/null @@ -1,61 +0,0 @@ -with builtins; - -rec { - - fold = op: nul: list: - if list == [] - then nul - else op (head list) (fold op nul (tail list)); - - concat = - fold (x: y: x + y) ""; - - and = fold (x: y: x && y) true; - - flatten = x: - if isList x - then fold (x: y: (flatten x) ++ y) [] x - else [x]; - - sum = foldl' (x: y: add x y) 0; - - hasSuffix = ext: fileName: - let lenFileName = stringLength fileName; - lenExt = stringLength ext; - in !(lessThan lenFileName lenExt) && - substring (sub lenFileName lenExt) lenFileName fileName == ext; - - # Split a list at the given position. - splitAt = pos: list: - if pos == 0 then {first = []; second = list;} else - if list == [] then {first = []; second = [];} else - let res = splitAt (sub pos 1) (tail list); - in {first = [(head list)] ++ res.first; second = res.second;}; - - # Stable merge sort. - sortBy = comp: list: - if lessThan 1 (length list) - then - let - split = splitAt (div (length list) 2) list; - first = sortBy comp split.first; - second = sortBy comp split.second; - in mergeLists comp first second - else list; - - mergeLists = comp: list1: list2: - if list1 == [] then list2 else - if list2 == [] then list1 else - if comp (head list2) (head list1) then [(head list2)] ++ mergeLists comp list1 (tail list2) else - [(head list1)] ++ mergeLists comp (tail list1) list2; - - id = x: x; - - const = x: y: x; - - range = first: last: - if first > last - then [] - else genList (n: first + n) (last - first + 1); - -} diff --git a/tests/lang/parse-fail-dup-attrs-1.err.exp b/tests/lang/parse-fail-dup-attrs-1.err.exp deleted file mode 100644 index 4fe6b7a1f..000000000 --- a/tests/lang/parse-fail-dup-attrs-1.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: attribute 'x' already defined at «stdin»:1:3 - - at «stdin»:3:3: - - 2| y = 456; - 3| x = 789; - | ^ diff --git a/tests/lang/parse-fail-dup-attrs-1.nix b/tests/lang/parse-fail-dup-attrs-1.nix deleted file mode 100644 index 2c02317d2..000000000 --- a/tests/lang/parse-fail-dup-attrs-1.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ x = 123; - y = 456; - x = 789; -} diff --git a/tests/lang/parse-fail-dup-attrs-2.err.exp b/tests/lang/parse-fail-dup-attrs-2.err.exp deleted file mode 100644 index 3aba2891f..000000000 --- a/tests/lang/parse-fail-dup-attrs-2.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: attribute 'x' already defined at «stdin»:9:5 - - at «stdin»:10:17: - - 9| x = 789; - 10| inherit (as) x; - | ^ diff --git a/tests/lang/parse-fail-dup-attrs-2.nix b/tests/lang/parse-fail-dup-attrs-2.nix deleted file mode 100644 index 864d9865e..000000000 --- a/tests/lang/parse-fail-dup-attrs-2.nix +++ /dev/null @@ -1,13 +0,0 @@ -let { - - as = { - x = 123; - y = 456; - }; - - bs = { - x = 789; - inherit (as) x; - }; - -} diff --git a/tests/lang/parse-fail-dup-attrs-3.err.exp b/tests/lang/parse-fail-dup-attrs-3.err.exp deleted file mode 100644 index 3aba2891f..000000000 --- a/tests/lang/parse-fail-dup-attrs-3.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: attribute 'x' already defined at «stdin»:9:5 - - at «stdin»:10:17: - - 9| x = 789; - 10| inherit (as) x; - | ^ diff --git a/tests/lang/parse-fail-dup-attrs-3.nix b/tests/lang/parse-fail-dup-attrs-3.nix deleted file mode 100644 index 114d19779..000000000 --- a/tests/lang/parse-fail-dup-attrs-3.nix +++ /dev/null @@ -1,13 +0,0 @@ -let { - - as = { - x = 123; - y = 456; - }; - - bs = rec { - x = 789; - inherit (as) x; - }; - -} diff --git a/tests/lang/parse-fail-dup-attrs-4.err.exp b/tests/lang/parse-fail-dup-attrs-4.err.exp deleted file mode 100644 index ff68446a1..000000000 --- a/tests/lang/parse-fail-dup-attrs-4.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: attribute 'services.ssh.port' already defined at «stdin»:2:3 - - at «stdin»:3:3: - - 2| services.ssh.port = 22; - 3| services.ssh.port = 23; - | ^ diff --git a/tests/lang/parse-fail-dup-attrs-4.nix b/tests/lang/parse-fail-dup-attrs-4.nix deleted file mode 100644 index 77417432b..000000000 --- a/tests/lang/parse-fail-dup-attrs-4.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - services.ssh.port = 22; - services.ssh.port = 23; -} diff --git a/tests/lang/parse-fail-dup-attrs-6.err.exp b/tests/lang/parse-fail-dup-attrs-6.err.exp deleted file mode 100644 index 74823fc25..000000000 --- a/tests/lang/parse-fail-dup-attrs-6.err.exp +++ /dev/null @@ -1 +0,0 @@ -error: attribute ‘services.ssh’ at (string):3:3 already defined at (string):2:3 diff --git a/tests/lang/parse-fail-dup-attrs-7.err.exp b/tests/lang/parse-fail-dup-attrs-7.err.exp deleted file mode 100644 index 512a499ca..000000000 --- a/tests/lang/parse-fail-dup-attrs-7.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: attribute 'x' already defined at «stdin»:6:12 - - at «stdin»:7:12: - - 6| inherit x; - 7| inherit x; - | ^ diff --git a/tests/lang/parse-fail-dup-attrs-7.nix b/tests/lang/parse-fail-dup-attrs-7.nix deleted file mode 100644 index bbc3eb08c..000000000 --- a/tests/lang/parse-fail-dup-attrs-7.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - - x = 1; - - as = { - inherit x; - inherit x; - }; -}
\ No newline at end of file diff --git a/tests/lang/parse-fail-dup-formals.err.exp b/tests/lang/parse-fail-dup-formals.err.exp deleted file mode 100644 index 1d566fb33..000000000 --- a/tests/lang/parse-fail-dup-formals.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: duplicate formal function argument 'x' - - at «stdin»:1:8: - - 1| {x, y, x}: x - | ^ diff --git a/tests/lang/parse-fail-dup-formals.nix b/tests/lang/parse-fail-dup-formals.nix deleted file mode 100644 index a0edd91a9..000000000 --- a/tests/lang/parse-fail-dup-formals.nix +++ /dev/null @@ -1 +0,0 @@ -{x, y, x}: x
\ No newline at end of file diff --git a/tests/lang/parse-fail-eof-in-string.err.exp b/tests/lang/parse-fail-eof-in-string.err.exp deleted file mode 100644 index f9fa72312..000000000 --- a/tests/lang/parse-fail-eof-in-string.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: syntax error, unexpected end of file, expecting '"' - - at «stdin»:3:5: - - 2| # Note that this file must not end with a newline. - 3| a 1"$ - | ^ diff --git a/tests/lang/parse-fail-eof-in-string.nix b/tests/lang/parse-fail-eof-in-string.nix deleted file mode 100644 index 19775d2ec..000000000 --- a/tests/lang/parse-fail-eof-in-string.nix +++ /dev/null @@ -1,3 +0,0 @@ -# https://github.com/NixOS/nix/issues/6562 -# Note that this file must not end with a newline. -a 1"$
\ No newline at end of file diff --git a/tests/lang/parse-fail-mixed-nested-attrs1.err.exp b/tests/lang/parse-fail-mixed-nested-attrs1.err.exp deleted file mode 100644 index 32f776795..000000000 --- a/tests/lang/parse-fail-mixed-nested-attrs1.err.exp +++ /dev/null @@ -1,8 +0,0 @@ -error: attribute 'z' already defined at «stdin»:3:16 - - at «stdin»:2:3: - - 1| { - 2| x.z = 3; - | ^ - 3| x = { y = 3; z = 3; }; diff --git a/tests/lang/parse-fail-mixed-nested-attrs1.nix b/tests/lang/parse-fail-mixed-nested-attrs1.nix deleted file mode 100644 index 11e40e66f..000000000 --- a/tests/lang/parse-fail-mixed-nested-attrs1.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - x.z = 3; - x = { y = 3; z = 3; }; -} diff --git a/tests/lang/parse-fail-mixed-nested-attrs2.err.exp b/tests/lang/parse-fail-mixed-nested-attrs2.err.exp deleted file mode 100644 index 0437cd50c..000000000 --- a/tests/lang/parse-fail-mixed-nested-attrs2.err.exp +++ /dev/null @@ -1,8 +0,0 @@ -error: attribute 'y' already defined at «stdin»:3:9 - - at «stdin»:2:3: - - 1| { - 2| x.y.y = 3; - | ^ - 3| x = { y.y= 3; z = 3; }; diff --git a/tests/lang/parse-fail-mixed-nested-attrs2.nix b/tests/lang/parse-fail-mixed-nested-attrs2.nix deleted file mode 100644 index 17da82e5f..000000000 --- a/tests/lang/parse-fail-mixed-nested-attrs2.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - x.y.y = 3; - x = { y.y= 3; z = 3; }; -} diff --git a/tests/lang/parse-fail-patterns-1.err.exp b/tests/lang/parse-fail-patterns-1.err.exp deleted file mode 100644 index 634a04aaa..000000000 --- a/tests/lang/parse-fail-patterns-1.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: duplicate formal function argument 'args' - - at «stdin»:1:1: - - 1| args@{args, x, y, z}: x - | ^ - 2| diff --git a/tests/lang/parse-fail-patterns-1.nix b/tests/lang/parse-fail-patterns-1.nix deleted file mode 100644 index 7b4061641..000000000 --- a/tests/lang/parse-fail-patterns-1.nix +++ /dev/null @@ -1 +0,0 @@ -args@{args, x, y, z}: x diff --git a/tests/lang/parse-fail-regression-20060610.err.exp b/tests/lang/parse-fail-regression-20060610.err.exp deleted file mode 100644 index 167d01e85..000000000 --- a/tests/lang/parse-fail-regression-20060610.err.exp +++ /dev/null @@ -1,8 +0,0 @@ -error: undefined variable 'gcc' - - at «stdin»:8:12: - - 7| - 8| body = ({ - | ^ - 9| inherit gcc; diff --git a/tests/lang/parse-fail-regression-20060610.nix b/tests/lang/parse-fail-regression-20060610.nix deleted file mode 100644 index b1934f7e1..000000000 --- a/tests/lang/parse-fail-regression-20060610.nix +++ /dev/null @@ -1,11 +0,0 @@ -let { - x = - {gcc}: - { - inherit gcc; - }; - - body = ({ - inherit gcc; - }).gcc; -} diff --git a/tests/lang/parse-fail-undef-var-2.err.exp b/tests/lang/parse-fail-undef-var-2.err.exp deleted file mode 100644 index 77c96bbd2..000000000 --- a/tests/lang/parse-fail-undef-var-2.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: syntax error, unexpected ':', expecting '}' - - at «stdin»:3:13: - - 2| - 3| f = {x, y : - | ^ diff --git a/tests/lang/parse-fail-undef-var-2.nix b/tests/lang/parse-fail-undef-var-2.nix deleted file mode 100644 index c10a52b1e..000000000 --- a/tests/lang/parse-fail-undef-var-2.nix +++ /dev/null @@ -1,7 +0,0 @@ -let { - - f = {x, y : ["baz" "bar" z "bat"]}: x + y; - - body = f {x = "foo"; y = "bar";}; - -} diff --git a/tests/lang/parse-fail-undef-var.err.exp b/tests/lang/parse-fail-undef-var.err.exp deleted file mode 100644 index 48e88747f..000000000 --- a/tests/lang/parse-fail-undef-var.err.exp +++ /dev/null @@ -1,7 +0,0 @@ -error: undefined variable 'y' - - at «stdin»:1:4: - - 1| x: y - | ^ - 2| diff --git a/tests/lang/parse-fail-undef-var.nix b/tests/lang/parse-fail-undef-var.nix deleted file mode 100644 index 7b6300811..000000000 --- a/tests/lang/parse-fail-undef-var.nix +++ /dev/null @@ -1 +0,0 @@ -x: y diff --git a/tests/lang/parse-fail-utf8.err.exp b/tests/lang/parse-fail-utf8.err.exp deleted file mode 100644 index 6087479a3..000000000 --- a/tests/lang/parse-fail-utf8.err.exp +++ /dev/null @@ -1,6 +0,0 @@ -error: syntax error, unexpected invalid token, expecting end of file - - at «stdin»:1:5: - - 1| 123 - | ^ diff --git a/tests/lang/parse-fail-utf8.nix b/tests/lang/parse-fail-utf8.nix deleted file mode 100644 index 34948d48a..000000000 --- a/tests/lang/parse-fail-utf8.nix +++ /dev/null @@ -1 +0,0 @@ -123 é 4 diff --git a/tests/lang/parse-okay-1.exp b/tests/lang/parse-okay-1.exp deleted file mode 100644 index d5ab5f18a..000000000 --- a/tests/lang/parse-okay-1.exp +++ /dev/null @@ -1 +0,0 @@ -({ x, y, z }: ((x + y) + z)) diff --git a/tests/lang/parse-okay-1.nix b/tests/lang/parse-okay-1.nix deleted file mode 100644 index 23a58ed10..000000000 --- a/tests/lang/parse-okay-1.nix +++ /dev/null @@ -1 +0,0 @@ -{x, y, z}: x + y + z diff --git a/tests/lang/parse-okay-crlf.exp b/tests/lang/parse-okay-crlf.exp deleted file mode 100644 index 4213609fc..000000000 --- a/tests/lang/parse-okay-crlf.exp +++ /dev/null @@ -1 +0,0 @@ -rec { foo = "multi\nline\n string\n test\r"; x = y; y = 123; z = 456; } diff --git a/tests/lang/parse-okay-crlf.nix b/tests/lang/parse-okay-crlf.nix deleted file mode 100644 index 21518d4c6..000000000 --- a/tests/lang/parse-okay-crlf.nix +++ /dev/null @@ -1,17 +0,0 @@ -rec { - - /* Dit is
- een test. */ - - x = - # Dit is een test.
y; - - y = 123;
- - # CR or CR/LF (but not explicit \r's) in strings should be - # translated to LF. - foo = "multi
line
- string - test\r"; - - z = 456;
} diff --git a/tests/lang/parse-okay-dup-attrs-5.exp b/tests/lang/parse-okay-dup-attrs-5.exp deleted file mode 100644 index 88b0b036f..000000000 --- a/tests/lang/parse-okay-dup-attrs-5.exp +++ /dev/null @@ -1 +0,0 @@ -{ services = { ssh = { enable = true; port = 23; }; }; } diff --git a/tests/lang/parse-okay-dup-attrs-5.nix b/tests/lang/parse-okay-dup-attrs-5.nix deleted file mode 100644 index f4b9efd0c..000000000 --- a/tests/lang/parse-okay-dup-attrs-5.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - services.ssh = { enable = true; }; - services.ssh.port = 23; -} diff --git a/tests/lang/parse-okay-dup-attrs-6.exp b/tests/lang/parse-okay-dup-attrs-6.exp deleted file mode 100644 index 88b0b036f..000000000 --- a/tests/lang/parse-okay-dup-attrs-6.exp +++ /dev/null @@ -1 +0,0 @@ -{ services = { ssh = { enable = true; port = 23; }; }; } diff --git a/tests/lang/parse-okay-dup-attrs-6.nix b/tests/lang/parse-okay-dup-attrs-6.nix deleted file mode 100644 index ae6d7a769..000000000 --- a/tests/lang/parse-okay-dup-attrs-6.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - services.ssh.port = 23; - services.ssh = { enable = true; }; -} diff --git a/tests/lang/parse-okay-mixed-nested-attrs-1.exp b/tests/lang/parse-okay-mixed-nested-attrs-1.exp deleted file mode 100644 index 89c66f760..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-1.exp +++ /dev/null @@ -1 +0,0 @@ -{ x = { q = 3; y = 3; z = 3; }; } diff --git a/tests/lang/parse-okay-mixed-nested-attrs-1.nix b/tests/lang/parse-okay-mixed-nested-attrs-1.nix deleted file mode 100644 index fd1001c8c..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-1.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - x = { y = 3; z = 3; }; - x.q = 3; -} diff --git a/tests/lang/parse-okay-mixed-nested-attrs-2.exp b/tests/lang/parse-okay-mixed-nested-attrs-2.exp deleted file mode 100644 index 89c66f760..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-2.exp +++ /dev/null @@ -1 +0,0 @@ -{ x = { q = 3; y = 3; z = 3; }; } diff --git a/tests/lang/parse-okay-mixed-nested-attrs-2.nix b/tests/lang/parse-okay-mixed-nested-attrs-2.nix deleted file mode 100644 index ad066b680..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-2.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - x.q = 3; - x = { y = 3; z = 3; }; -} diff --git a/tests/lang/parse-okay-mixed-nested-attrs-3.exp b/tests/lang/parse-okay-mixed-nested-attrs-3.exp deleted file mode 100644 index b89a59734..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-3.exp +++ /dev/null @@ -1 +0,0 @@ -{ services = { httpd = { enable = true; }; ssh = { enable = true; port = 123; }; }; } diff --git a/tests/lang/parse-okay-mixed-nested-attrs-3.nix b/tests/lang/parse-okay-mixed-nested-attrs-3.nix deleted file mode 100644 index 45a33e480..000000000 --- a/tests/lang/parse-okay-mixed-nested-attrs-3.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - services.ssh.enable = true; - services.ssh = { port = 123; }; - services = { - httpd.enable = true; - }; -} diff --git a/tests/lang/parse-okay-regression-20041027.exp b/tests/lang/parse-okay-regression-20041027.exp deleted file mode 100644 index 9df7219e4..000000000 --- a/tests/lang/parse-okay-regression-20041027.exp +++ /dev/null @@ -1 +0,0 @@ -({ fetchurl, stdenv }: ((stdenv).mkDerivation { name = "libXi-6.0.1"; src = (fetchurl { md5 = "7e935a42428d63a387b3c048be0f2756"; url = "http://freedesktop.org/~xlibs/release/libXi-6.0.1.tar.bz2"; }); })) diff --git a/tests/lang/parse-okay-regression-20041027.nix b/tests/lang/parse-okay-regression-20041027.nix deleted file mode 100644 index ae2e256ee..000000000 --- a/tests/lang/parse-okay-regression-20041027.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl /* pkgconfig, libX11 */ }: - -stdenv.mkDerivation { - name = "libXi-6.0.1"; - src = fetchurl { - url = http://freedesktop.org/~xlibs/release/libXi-6.0.1.tar.bz2; - md5 = "7e935a42428d63a387b3c048be0f2756"; - }; -/* buildInputs = [pkgconfig]; - propagatedBuildInputs = [libX11]; */ -} diff --git a/tests/lang/parse-okay-regression-751.exp b/tests/lang/parse-okay-regression-751.exp deleted file mode 100644 index e2ed886fe..000000000 --- a/tests/lang/parse-okay-regression-751.exp +++ /dev/null @@ -1 +0,0 @@ -(let const = (a: "const"); in ((const { x = "q"; }))) diff --git a/tests/lang/parse-okay-regression-751.nix b/tests/lang/parse-okay-regression-751.nix deleted file mode 100644 index 05c78b301..000000000 --- a/tests/lang/parse-okay-regression-751.nix +++ /dev/null @@ -1,2 +0,0 @@ -let const = a: "const"; in -''${ const { x = "q"; }}'' diff --git a/tests/lang/parse-okay-subversion.exp b/tests/lang/parse-okay-subversion.exp deleted file mode 100644 index 4168ee8bf..000000000 --- a/tests/lang/parse-okay-subversion.exp +++ /dev/null @@ -1 +0,0 @@ -({ fetchurl, localServer ? false, httpServer ? false, sslSupport ? false, pythonBindings ? false, javaSwigBindings ? false, javahlBindings ? false, stdenv, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null }: assert (expat != null); assert (localServer -> (db4 != null)); assert (httpServer -> ((httpd != null) && ((httpd).expat == expat))); assert (sslSupport -> ((openssl != null) && (httpServer -> ((httpd).openssl == openssl)))); assert (pythonBindings -> ((swig != null) && (swig).pythonSupport)); assert (javaSwigBindings -> ((swig != null) && (swig).javaSupport)); assert (javahlBindings -> (j2sdk != null)); ((stdenv).mkDerivation { builder = /foo/bar; db4 = (if localServer then db4 else null); inherit expat ; inherit httpServer ; httpd = (if httpServer then httpd else null); j2sdk = (if javaSwigBindings then (swig).j2sdk else (if javahlBindings then j2sdk else null)); inherit javaSwigBindings ; inherit javahlBindings ; inherit localServer ; name = "subversion-1.1.1"; openssl = (if sslSupport then openssl else null); patches = (if javahlBindings then [ (/javahl.patch) ] else [ ]); python = (if pythonBindings then (swig).python else null); inherit pythonBindings ; src = (fetchurl { md5 = "a180c3fe91680389c210c99def54d9e0"; url = "http://subversion.tigris.org/tarballs/subversion-1.1.1.tar.bz2"; }); inherit sslSupport ; swig = (if (pythonBindings || javaSwigBindings) then swig else null); })) diff --git a/tests/lang/parse-okay-subversion.nix b/tests/lang/parse-okay-subversion.nix deleted file mode 100644 index 356272815..000000000 --- a/tests/lang/parse-okay-subversion.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ localServer ? false -, httpServer ? false -, sslSupport ? false -, pythonBindings ? false -, javaSwigBindings ? false -, javahlBindings ? false -, stdenv, fetchurl -, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null -}: - -assert expat != null; -assert localServer -> db4 != null; -assert httpServer -> httpd != null && httpd.expat == expat; -assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); -assert pythonBindings -> swig != null && swig.pythonSupport; -assert javaSwigBindings -> swig != null && swig.javaSupport; -assert javahlBindings -> j2sdk != null; - -stdenv.mkDerivation { - name = "subversion-1.1.1"; - - builder = /foo/bar; - src = fetchurl { - url = http://subversion.tigris.org/tarballs/subversion-1.1.1.tar.bz2; - md5 = "a180c3fe91680389c210c99def54d9e0"; - }; - - # This is a hopefully temporary fix for the problem that - # libsvnjavahl.so isn't linked against libstdc++, which causes - # loading the library into the JVM to fail. - patches = if javahlBindings then [/javahl.patch] else []; - - openssl = if sslSupport then openssl else null; - httpd = if httpServer then httpd else null; - db4 = if localServer then db4 else null; - swig = if pythonBindings || javaSwigBindings then swig else null; - python = if pythonBindings then swig.python else null; - j2sdk = if javaSwigBindings then swig.j2sdk else - if javahlBindings then j2sdk else null; - - inherit expat localServer httpServer sslSupport - pythonBindings javaSwigBindings javahlBindings; -} diff --git a/tests/lang/parse-okay-url.exp b/tests/lang/parse-okay-url.exp deleted file mode 100644 index e5f0829b0..000000000 --- a/tests/lang/parse-okay-url.exp +++ /dev/null @@ -1 +0,0 @@ -[ ("x:x") ("https://svn.cs.uu.nl:12443/repos/trace/trunk") ("http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2") ("http://losser.st-lab.cs.uu.nl/~armijn/.nix/gcc-3.3.4-static-nix.tar.gz") ("http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz") ("https://ftp5.gwdg.de/pub/linux/archlinux/extra/os/x86_64/unzip-6.0-14-x86_64.pkg.tar.zst") ("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz") ] diff --git a/tests/lang/parse-okay-url.nix b/tests/lang/parse-okay-url.nix deleted file mode 100644 index 08de27d0a..000000000 --- a/tests/lang/parse-okay-url.nix +++ /dev/null @@ -1,8 +0,0 @@ -[ x:x - https://svn.cs.uu.nl:12443/repos/trace/trunk - http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 - http://losser.st-lab.cs.uu.nl/~armijn/.nix/gcc-3.3.4-static-nix.tar.gz - http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz - https://ftp5.gwdg.de/pub/linux/archlinux/extra/os/x86_64/unzip-6.0-14-x86_64.pkg.tar.zst - ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz -] diff --git a/tests/lang/readDir/bar b/tests/lang/readDir/bar deleted file mode 100644 index e69de29bb..000000000 --- a/tests/lang/readDir/bar +++ /dev/null diff --git a/tests/lang/readDir/foo/git-hates-directories b/tests/lang/readDir/foo/git-hates-directories deleted file mode 100644 index e69de29bb..000000000 --- a/tests/lang/readDir/foo/git-hates-directories +++ /dev/null diff --git a/tests/lang/readDir/ldir b/tests/lang/readDir/ldir deleted file mode 120000 index 191028156..000000000 --- a/tests/lang/readDir/ldir +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/lang/readDir/linked b/tests/lang/readDir/linked deleted file mode 120000 index c503f86a0..000000000 --- a/tests/lang/readDir/linked +++ /dev/null @@ -1 +0,0 @@ -foo/git-hates-directories
\ No newline at end of file |