Skip to content

Commit 4ca4b94

Browse files
(haskell-nix#1029) upd nix submodule
1 parent 9bccd0f commit 4ca4b94

File tree

3 files changed

+16
-20
lines changed

3 files changed

+16
-20
lines changed

data/nix

Submodule nix updated 900 files

hnix.cabal

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,10 @@ license: BSD-3-Clause
1212
license-file: License
1313
build-type: Simple
1414
data-dir: data/
15-
data-files:
16-
nix/corepkgs/buildenv.nix
17-
nix/corepkgs/unpack-channel.nix
18-
nix/corepkgs/derivation.nix
19-
nix/corepkgs/fetchurl.nix
20-
nix/corepkgs/imported-drv-to-derivation.nix
2115
extra-source-files:
2216
ChangeLog.md
2317
ReadMe.md
2418
License
25-
data/nix/corepkgs/buildenv.nix
26-
data/nix/corepkgs/unpack-channel.nix
27-
data/nix/corepkgs/derivation.nix
28-
data/nix/corepkgs/fetchurl.nix
29-
data/nix/corepkgs/imported-drv-to-derivation.nix
3019
data/nix/tests/lang/binary-data
3120
data/nix/tests/lang/data
3221
data/nix/tests/lang/dir1/a.nix
@@ -38,7 +27,6 @@ extra-source-files:
3827
data/nix/tests/lang/dir4/a.nix
3928
data/nix/tests/lang/dir4/c.nix
4029
data/nix/tests/lang/eval-fail-abort.nix
41-
data/nix/tests/lang/eval-fail-antiquoted-path.nix
4230
data/nix/tests/lang/eval-fail-assert.nix
4331
data/nix/tests/lang/eval-fail-bad-antiquote-1.nix
4432
data/nix/tests/lang/eval-fail-bad-antiquote-2.nix

tests/NixLanguageTests.hs

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,28 @@ groupBy key = Map.fromListWith (<>) . fmap (key &&& pure)
5656
-- previously passed.
5757
newFailingTests :: Set String
5858
newFailingTests = Set.fromList
59-
[
60-
"eval-okay-hash"
61-
, "eval-okay-path" -- #128
59+
[ "eval-okay-path" -- #128
6260
, "eval-okay-fromTOML"
63-
, "eval-okay-ind-string" -- #1000 #610
61+
, "eval-okay-zipAttrsWith"
62+
, "eval-okay-tojson"
63+
, "eval-okay-search-path"
64+
, "eval-okay-sort"
65+
, "eval-okay-path-antiquotation"
66+
, "eval-okay-groupBy"
67+
, "eval-okay-getattrpos-functionargs"
68+
, "eval-okay-floor-ceil"
69+
, "eval-okay-attrs6"
6470
]
6571

6672
-- | Upstream tests that test cases that HNix disaded as a misfeature that is used so rarely
6773
-- that it more effective to fix it & lint it out of existance.
6874
deprecatedRareNixQuirkTests :: Set String
69-
deprecatedRareNixQuirkTests = Set.fromList $
70-
one
71-
-- A rare quirk of Nix that is proper to fix&enforce then to support (see git commit history)
75+
deprecatedRareNixQuirkTests = Set.fromList
76+
[ -- A rare quirk of Nix that is proper to fix&enforce then to support (see git commit history)
7277
"eval-okay-strings-as-attrs-names"
78+
-- Nix upstream removed this test alltogather
79+
, "eval-okay-hash"
80+
]
7381

7482
genTests :: IO TestTree
7583
genTests =

0 commit comments

Comments
 (0)