MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

haskell-ng: update Cabal to version 1.22.1.1 and binary to version 0.7.4.0

Browse source
This commit is contained in:
Peter Simons 2015-02-24 12:09:32 +01:00
parent 475097ace1
commit 27e37a11d1
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -7,8 +7,8 @@ self: super: {
# Some packages need a non-core version of Cabal.
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
Cabal_1_22_1_0 = dontCheck super.Cabal_1_22_1_0;
cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_0; });
Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1;
cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; });
# Break infinite recursions.
digest = super.digest.override { inherit (pkgs) zlib; };

2
pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
View file

@ -38,7 +38,7 @@ self: super: {
unix = null;
# binary is not a core library for this compiler.
binary = self.binary_0_7_3_0;
binary = self.binary_0_7_4_0;
# deepseq is not a core library for this compiler.
deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;

2
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
View file

@ -32,7 +32,7 @@ self: super: {
unix = null;
# binary is not a core library for this compiler.
binary = self.binary_0_7_3_0;
binary = self.binary_0_7_4_0;
# deepseq is not a core library for this compiler.
deepseq = self.deepseq_1_4_0_0;

2
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
View file

@ -40,7 +40,7 @@ self: super: {
transformers-compat = disableCabalFlag super.transformers-compat "three";
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; };
Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_2_0; };
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;

2
pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
View file

@ -37,7 +37,7 @@ self: super: {
transformers-compat = disableCabalFlag super.transformers-compat "three";
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; };
Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;

4
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
View file

@ -40,7 +40,7 @@ self: super: {
terminfo = self.terminfo_0_4_0_0;
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_1_0 = super.Cabal_1_22_1_0.override { binary = self.binary_0_7_3_0; };
Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; };
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
@ -87,7 +87,7 @@ self: super: {
presburger pretty process QuickCheck random smtLib syb text
tf-random transformers utf8-string
];
buildTools = with self; [ alex happy Cabal_1_22_1_0 ];
buildTools = with self; [ alex happy Cabal_1_22_1_1 ];
patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal";
description = "Cryptol: The Language of Cryptography";
license = pkgs.stdenv.lib.licenses.bsd3;