diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/haskell/hadrian')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch b/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch new file mode 100644 index 000000000000..d813fef31c8d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch @@ -0,0 +1,13 @@ +diff --git a/hadrian.cabal b/hadrian.cabal +index 70fded11aa..3893537f05 100644 +--- a/hadrian.cabal ++++ b/hadrian.cabal +@@ -150,7 +150,7 @@ executable hadrian + , TypeOperators + other-extensions: MultiParamTypeClasses + , TypeFamilies +- build-depends: Cabal >= 3.2 && < 3.9 ++ build-depends: Cabal >= 3.2 && < 3.11 + , base >= 4.11 && < 5 + , bytestring >= 0.10 && < 0.13 + , containers >= 0.5 && < 0.7 diff --git a/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix b/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix index 1be21d6f4519..7a44e2eeffc2 100644 --- a/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix +++ b/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -23,6 +23,10 @@ mkDerivation { ''; patches = lib.optionals (!enableHyperlinkedSource) [ ./disable-hyperlinked-source.patch + ] ++ lib.optionals (lib.elem ghcVersion [ "9.8.1" "9.8.2" ]) [ + # Incorrect bounds on Cabal + # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 + ./hadrian-9.8.1-allow-Cabal-3.10.patch ]; # Overwrite UserSettings.hs with a provided custom one postPatch = lib.optionalString (userSettings != null) '' |