From a4528a1270403f607702d196f3dd98a62d26e5f2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 18 Aug 2021 02:12:09 +0200 Subject: [PATCH] haskellPackages.ghc-api-compat: Use correct versions for every ghc --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 + .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e207413455ec..b0c08f188d09 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1942,4 +1942,7 @@ EOT Cabal = self.Cabal_3_6_0_0; }; + # ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6 + ghc-api-compat = doJailbreak super.ghc-api-compat; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super 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 a15a3f404fbe..08431ee0dd39 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -129,4 +129,5 @@ self: super: { # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers vector = dontCheck super.vector; + ghc-api-compat = super.ghc-api-compat_8_6; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 67da108858f9..ec51f8c03ae4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -118,6 +118,7 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version + - ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5 package-maintainers: abbradar: