diff options
author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2015-12-11 07:46:40 -0500 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-12-16 21:33:56 +0100 |
commit | bc5f82dfc26cb9135b419dc706178f4696fdaefe (patch) | |
tree | 5bba2f355f8b133c52540259f1149abed79b81f5 | |
parent | 1f108490f13020b114f5872b74282ed3ac44eac0 (diff) | |
download | nixpkgs-bc5f82dfc26cb9135b419dc706178f4696fdaefe.tar nixpkgs-bc5f82dfc26cb9135b419dc706178f4696fdaefe.tar.gz nixpkgs-bc5f82dfc26cb9135b419dc706178f4696fdaefe.tar.bz2 nixpkgs-bc5f82dfc26cb9135b419dc706178f4696fdaefe.tar.lz nixpkgs-bc5f82dfc26cb9135b419dc706178f4696fdaefe.tar.xz nixpkgs-bc5f82dfc26cb9135b419dc706178f4696fdaefe.tar.zst nixpkgs-bc5f82dfc26cb9135b419dc706178f4696fdaefe.zip |
Fixup pointfree package.
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fd6d521369f..d844f2a047a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -940,4 +940,8 @@ self: super: { # https://github.com/mainland/language-c-quote/issues/57 language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; + + # The package doesn't yet compile with new HSE: https://github.com/bmillwood/pointfree/pull/13 + pointfree = super.pointfree.override { haskell-src-exts = self.haskell-src-exts_1_16_0_1; }; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 35fd547d334..00e12b01564 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -92,7 +92,6 @@ self: super: { utf8-string = overrideCabal super.utf8-string (drv: { postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); - pointfree = doJailbreak super.pointfree; # acid-state/safecopy#25 acid-state/safecopy#26 safecopy = dontCheck (super.safecopy); |