public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-Cabal: update from 1.24.0.0 to 1.24.1.0

This commit is contained in:
Peter Simons 2016-11-05 14:09:35 +01:00
parent 5dd3c22717
commit d9c3f3fbaf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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; };

4
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -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";