diff options
| author | Peter Simons <simons@cryp.to> | 2016-11-05 14:09:35 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-11-07 08:36:00 +0100 |
| commit | d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8 (patch) | |
| tree | 494e0221b95a9333f1c57b74fdc85b1e704057c1 | |
| parent | 5dd3c227170fc61a8c1fe7ef84975c026a6c81c0 (diff) | |
| download | nixlib-d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8.tar nixlib-d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8.tar.gz nixlib-d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8.tar.bz2 nixlib-d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8.tar.lz nixlib-d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8.tar.xz nixlib-d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8.tar.zst nixlib-d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8.zip | |
haskell-Cabal: update from 1.24.0.0 to 1.24.1.0
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 |
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 82073ff09897..aaa615f4caa3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -5,7 +5,7 @@ with import ./lib.nix { inherit pkgs; }; self: super: { # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; 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 95629c375329..9710d139f8a4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -37,10 +37,10 @@ self: super: { xhtml = null; # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Build jailbreak-cabal with the latest version of Cabal. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; }; Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; |