picnoir
/
hnix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for building with GHC 8.6.5 under Nix

This commit is contained in:
John Wiegley 2020-01-13 13:49:02 -08:00
parent 0478ab6ba6
commit 0ca6613d4b
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
default.nix
View File

@ -83,6 +83,7 @@ let
mono-traversable = dontCheck super.mono-traversable;
regex-tdfa-text = doJailbreak super.regex-tdfa-text;
these = doJailbreak super.these;
semialign = super.semialign_1_1;
semialign-indexed = doJailbreak super.semialign-indexed;
multistate = doJailbreak (overrideCabal super.multistate (attrs: { broken = false; }));
butcher = doJailbreak (overrideCabal super.butcher (attrs: { broken = false; }));

5
tests/NixLanguageTests.hs
View File

@ -67,7 +67,10 @@ groupBy key = Map.fromListWith (++) . map (key &&& pure)
-- previously passed.
newFailingTests :: Set String
newFailingTests = Set.fromList
[ "eval-okay-path"
[ "eval-okay-hash"
, "eval-okay-hashfile"
, "eval-okay-path"
, "eval-okay-types"
, "eval-okay-fromTOML"
, "eval-okay-context-introspection"
]

6
tests/PrettyParseTests.hs
View File

@ -214,7 +214,7 @@ prop_prettyparse p = do
, "----------------------------------------"
, vsep ["Normalised after:", indent 2 (pretty pv)]
, "========================================"
, vsep ["Normalised diff:", pretty (ppDiff (diff pp pv))]
, vsep ["Normalised diff:", pretty (ppDiff (ldiff pp pv))]
, "========================================"
]
assert (pp == pv)
@ -223,8 +223,8 @@ prop_prettyparse p = do
normalise = unlines . map (reverse . dropWhile isSpace . reverse) . lines
diff :: String -> String -> [Diff [String]]
diff s1 s2 = getDiff (map (: []) (lines s1)) (map (: []) (lines s2))
ldiff :: String -> String -> [Diff [String]]
ldiff s1 s2 = getDiff (map (: []) (lines s1)) (map (: []) (lines s2))
tests :: TestLimit -> TestTree
tests n = testProperty "Pretty/Parse Property" $ withTests n $ property $ do