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

haskell-ng: update to jailbreak-cabal 1.2, which supports Cabal 1.22.x now

Browse Source
This commit is contained in:
Peter Simons 2015-01-10 18:50:49 +01:00
parent e4c9a521ef
commit 7e2f1493b7
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,6 @@ self: super: {
Cabal_1_20_0_3 = overrideCabal super.Cabal_1_20_0_3 (drv: { doCheck = false; }); Cabal_1_20_0_3 = overrideCabal super.Cabal_1_20_0_3 (drv: { doCheck = false; });
Cabal_1_22_0_0 = overrideCabal super.Cabal_1_22_0_0 (drv: { doCheck = false; }); Cabal_1_22_0_0 = overrideCabal super.Cabal_1_22_0_0 (drv: { doCheck = false; });
cabal-install = overrideCabal (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; }) (drv: { doCheck = false; }); cabal-install = overrideCabal (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; }) (drv: { doCheck = false; });
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_3; };
# Break infinite recursions. # Break infinite recursions.
digest = super.digest.override { inherit (pkgs) zlib; }; digest = super.digest.override { inherit (pkgs) zlib; };

5
pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
View File

@ -30,9 +30,8 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# We cannot build jailbreak without Cabal 1.20.x, and we cannot build # We have Cabal 1.22.x.
# Cabal 1.20.x without jailbreak. Go figure. Let's use a sledgehammer. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
jailbreak-cabal = pkgs.haskellngPackages.jailbreak-cabal;
# GHC 7.10.x's Haddock binary cannot generate hoogle files. # GHC 7.10.x's Haddock binary cannot generate hoogle files.
# https://ghc.haskell.org/trac/ghc/ticket/9921 # https://ghc.haskell.org/trac/ghc/ticket/9921

15
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -27462,8 +27462,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "cipher-aes"; pname = "cipher-aes";
version = "0.2.9"; version = "0.2.10";
sha256 = "1nkrh8mrrh14zfhjz0lfidw0hw9c70hap9w24rvb14zgfnnasnlq"; sha256 = "1sglxv66byib2bcwhilcf4m4glhz02vxy2lxa0hvpwa9c0ifhcxz";
buildDepends = [ buildDepends = [
base byteable bytestring crypto-cipher-types securemem base byteable bytestring crypto-cipher-types securemem
]; ];
@ -27472,7 +27472,7 @@ self: {
QuickCheck test-framework test-framework-quickcheck2 QuickCheck test-framework test-framework-quickcheck2
]; ];
configureFlags = [ "-fsupport_aesni" ]; configureFlags = [ "-fsupport_aesni" ];
homepage = "http://github.com/vincenthz/hs-cipher-aes"; homepage = "https://github.com/vincenthz/hs-cipher-aes";
description = "Fast AES cipher implementation with advanced mode of operations"; description = "Fast AES cipher implementation with advanced mode of operations";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
@ -67263,9 +67263,8 @@ self: {
({ mkDerivation, base, Cabal }: ({ mkDerivation, base, Cabal }:
mkDerivation { mkDerivation {
pname = "jailbreak-cabal"; pname = "jailbreak-cabal";
version = "1.1"; version = "1.2";
sha256 = "0x0dkzfjsgqpjmldgami46ki9k7pgy7ll4slms0kdc89qryzp7dg"; sha256 = "1lwghsykfjx4zmcxk615lkyckrngj6d5rfyizif8vn5pjksygdsr";
editedCabalFile = "7fe251c9c0b2637b6e340eac33174fa3570218cbe2d92ec3df6ab4cf0a8387e7";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ base Cabal ]; buildDepends = [ base Cabal ];
@ -109898,8 +109897,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "typedquery"; pname = "typedquery";
version = "0.1.0.1"; version = "0.1.0.2";
sha256 = "18qx00rajs2li05ywd8bqqdfyg3d2wyza1jwrl1dh47bmhw049ll"; sha256 = "0l0fxhh1mq0801gb73pv531943i0iy5lm58hwyf5g6x6l50lj660";
buildDepends = [ buildDepends = [
aeson base bytestring haskell-src-meta parsec template-haskell text aeson base bytestring haskell-src-meta parsec template-haskell text
transformers transformers