From 69e8d6b92a8bb922001585994471bcad656a91ba Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 20 Jun 2021 23:22:32 +0200 Subject: [PATCH] haskellPackages.stylish-haskell: Fix on ghc 8.8.x --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79a7f26f292f..013156b0e16c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1936,4 +1936,7 @@ EOT # https://github.com/Porges/email-validate-hs/issues/58 ghcup = doJailbreak super.ghcup; + # Break out of "Cabal < 3.2" constraint. + stylish-haskell = doJailbreak super.stylish-haskell; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super 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 454b7338d66d..251a3d94bb20 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -84,9 +84,6 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); - # Break out of "Cabal < 3.2" constraint. - stylish-haskell = doJailbreak super.stylish-haskell; - # hackage-db 2.1.1 is incompatible with Cabal < 3.4 # See https://github.com/NixOS/cabal2nix/issues/501 hackage-db = self.hackage-db_2_1_0;