Skip to content

Commit

Permalink
Add patch for hnix ghc 8.6.5 issue
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Feb 9, 2022
1 parent a80b538 commit 56c2a4e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
5 changes: 5 additions & 0 deletions modules/configuration-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ in {
packages.ghc-lib-parser.patches = [
(fromUntil "8.10.0.0" "9.1" ../overlays/patches/ghc-lib-parser-8.10-global-unique-counters-in-rts.patch)
];

# See https://github.com/haskell-nix/hnix/pull/1053
packages.hnix.patches = [
(fromUntil "0.16.0" "0.16.0.1" ../patches/hnix.patch)
];
}
13 changes: 13 additions & 0 deletions patches/hnix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/Nix/Reduce.hs b/src/Nix/Reduce.hs
index 6eb3cdac..2a9ffd2a 100644
--- a/src/Nix/Reduce.hs
+++ b/src/Nix/Reduce.hs
@@ -22,7 +22,7 @@ module Nix.Reduce

import Nix.Prelude
import Control.Monad.Catch ( MonadCatch(catch) )
-#if !MIN_VERSION_base(4,13,0)
+#if !MIN_VERSION_base(4,12,0)
import Prelude hiding ( fail )
import Control.Monad.Fail
#endif

0 comments on commit 56c2a4e

Please sign in to comment.