about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-09-16 09:19:56 +0200
committerPeter Simons <simons@cryp.to>2015-09-19 08:20:40 +0200
commit2aaa587b71e19ff105fc482414f9dbc3060d57b6 (patch)
tree521682db0d914e9de9e392aed7943fde1dcc36b8 /pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
parent6c2993284a7bebb7e8add7c57331f4d472e9839c (diff)
downloadnixlib-2aaa587b71e19ff105fc482414f9dbc3060d57b6.tar
nixlib-2aaa587b71e19ff105fc482414f9dbc3060d57b6.tar.gz
nixlib-2aaa587b71e19ff105fc482414f9dbc3060d57b6.tar.bz2
nixlib-2aaa587b71e19ff105fc482414f9dbc3060d57b6.tar.lz
nixlib-2aaa587b71e19ff105fc482414f9dbc3060d57b6.tar.xz
nixlib-2aaa587b71e19ff105fc482414f9dbc3060d57b6.tar.zst
nixlib-2aaa587b71e19ff105fc482414f9dbc3060d57b6.zip
hackage-packages.nix: switch our default package set to Stackage Nightly
This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/af161fdf178e996c83d9c06059cb81cc4480b035
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/da73308b6359aa6083591ec7a2069090977d3be7
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/1994a4f865fe7e1cbe2c5b94a2214a5d91507f2c
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix21
1 files changed, 8 insertions, 13 deletions
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 db3cb7bd3ce7..05d24c07f940 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -61,19 +61,14 @@ self: super: {
     });
   };
 
-  idris =
-    let idris' = overrideCabal super.idris (drv: {
-      # "idris" binary cannot find Idris library otherwise while building.
-      # After installing it's completely fine though. Seems like Nix-specific
-      # issue so not reported.
-      preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
-      # https://github.com/idris-lang/Idris-dev/issues/2499
-      librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
-    });
-    in idris'.overrideScope (self: super: {
-      # https://github.com/idris-lang/Idris-dev/issues/2500
-      zlib = self.zlib_0_5_4_2;
-    });
+  idris = overrideCabal super.idris (drv: {
+    # "idris" binary cannot find Idris library otherwise while building.
+    # After installing it's completely fine though. Seems like Nix-specific
+    # issue so not reported.
+    preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
+    # https://github.com/idris-lang/Idris-dev/issues/2499
+    librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+  });
 
   Extra = appendPatch super.Extra (pkgs.fetchpatch {
     url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";