From 28556cd9abcb31ea64c218b07535f6d6589a426b Mon Sep 17 00:00:00 2001 From: andys8 Date: Mon, 20 Apr 2020 16:34:07 +0200 Subject: [PATCH] Haskell: apply-refact version has to match ghc This commit maps: * GHC 8.6 to apply-refact 0.6 * GHC 8.8 to apply-refact 0.7 * GHC 8.10 to apply-refact 0.8 See: --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 ++ .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 4 files changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 74ca5c9342f..b6595f67fee 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -94,4 +94,6 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); + # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_8_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index d2eb43c7ca5..57c38b22ccd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -91,4 +91,6 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_6_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 4c2f12b594f..56fdcede7cb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -96,4 +96,6 @@ self: super: { # of issues with Cabal 3.x. darcs = dontDistribute super.darcs; + # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_7_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7b43b826937..83b4b388cd8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2358,6 +2358,9 @@ extra-packages: - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x + - apply-refact == 0.6.0.0 # works with GHC 8.6.x + - apply-refact == 0.7.0.0 # works with GHC 8.8.x + - apply-refact == 0.8.0.0 # works with GHC 8.10.x - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*