From 56c2a4ede850764d4b16638287bd87eb33190cd8 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 9 Feb 2022 18:21:35 +1300 Subject: [PATCH] Add patch for hnix ghc 8.6.5 issue See https://github.com/haskell-nix/hnix/pull/1053 --- modules/configuration-nix.nix | 5 +++++ patches/hnix.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 patches/hnix.patch diff --git a/modules/configuration-nix.nix b/modules/configuration-nix.nix index ff75ed2f21..169d4b98e8 100644 --- a/modules/configuration-nix.nix +++ b/modules/configuration-nix.nix @@ -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) + ]; } diff --git a/patches/hnix.patch b/patches/hnix.patch new file mode 100644 index 0000000000..3c713f396c --- /dev/null +++ b/patches/hnix.patch @@ -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