diff options
| author | Peter Simons <simons@cryp.to> | 2015-04-19 18:32:03 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-04-19 18:32:03 +0200 |
| commit | d3b73ae30f9aea81ec1387713621657738eb1f8f (patch) | |
| tree | 9cdcfdcab0f499a8c60120e1f0b1be1f4c284f95 /pkgs | |
| parent | d50fe49dede130ef76c613c3827290dd7f21474c (diff) | |
| download | nixlib-d3b73ae30f9aea81ec1387713621657738eb1f8f.tar nixlib-d3b73ae30f9aea81ec1387713621657738eb1f8f.tar.gz nixlib-d3b73ae30f9aea81ec1387713621657738eb1f8f.tar.bz2 nixlib-d3b73ae30f9aea81ec1387713621657738eb1f8f.tar.lz nixlib-d3b73ae30f9aea81ec1387713621657738eb1f8f.tar.xz nixlib-d3b73ae30f9aea81ec1387713621657738eb1f8f.tar.zst nixlib-d3b73ae30f9aea81ec1387713621657738eb1f8f.zip | |
idris: simplify overrides as suggested by @abbradar
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 17e881946848..0aff4740fc9a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -49,16 +49,11 @@ self: super: { haddock-api = super.haddock-api_2_15_0_2; # Idris needs special version of some libraries - idris = overrideCabal (super.idris.overrideScope (self: super: { - mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); + idris = let super1 = super; in overrideCabal (super.idris.overrideScope (self: super: { annotated-wl-pprint = self.annotated-wl-pprint_0_5_3; blaze-html = self.blaze-html_0_7_0_3; blaze-markup = self.blaze-markup_0_6_2_0; - haskeline = self.haskeline_0_7_2_1; lens = self.lens_4_7_0_1; - mtl = self.mtl_2_2_1; - transformers = self.transformers_0_4_3_0; - transformers-compat = disableCabalFlag super.transformers-compat "three"; })) (drv: { patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; }); # warning: "Module ‘Control.Monad.Error’ is deprecated" |