From 79c97645b48c7eb8c4a1c70450d40af29b53a6d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Mar 2018 14:36:13 +0100
Subject: [PATCH] haskell-Cabal: version 2.2.x now accepts older versions of
text
---
.../configuration-ghc-8.2.x.nix | 21 +++----------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f14f0b0ebd19..c6e9f40a3168 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -86,27 +86,12 @@ self: super: {
# https://github.com/purescript/purescript/issues/3189
purescript = doJailbreak (super.purescript);
- # Needs text >=1.2.3.0 && <1.3, which is not the default yet.
- Cabal_2_2_0_0 = super.Cabal_2_2_0_0.overrideScope (self: super: {
- text = self.text_1_2_3_0;
- });
-
# These packages need Cabal 2.2.x, which is not the default.
- distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: {
- Cabal = self.Cabal_2_2_0_0;
- text = self.text_1_2_3_0;
- });
- hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: {
- Cabal = self.Cabal_2_2_0_0;
- text = self.text_1_2_3_0;
- });
- cabal2nix = super.cabal2nix.overrideScope (self: super: {
- Cabal = self.Cabal_2_2_0_0;
- text = self.text_1_2_3_0;
- });
+ distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
+ hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
+ cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
stylish-cabal = dontHaddock (dontCheck (super.stylish-cabal.overrideScope (self: super: {
Cabal = self.Cabal_2_2_0_0;
- text = self.text_1_2_3_0;
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
})));