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

Update Cabal to version 1.20.0.3 and cabal-install to version 1.20.0.6.

Browse Source
This commit is contained in:
Peter Simons 2015-01-01 20:57:15 +01:00
parent 493067d4bd
commit 9b8ff2f5f2
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix → pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "Cabal"; pname = "Cabal";
version = "1.20.0.2"; version = "1.20.0.3";
sha256 = "00mz24fj3qpq6rl3n3i73x6k0jzqix24k9izrlkzg07mpjcj4k93"; sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v";
buildDepends = [ deepseq filepath time ]; buildDepends = [ deepseq filepath time ];
testDepends = [ testDepends = [
extensibleExceptions filepath HUnit QuickCheck regexPosix extensibleExceptions filepath HUnit QuickCheck regexPosix

12
pkgs/tools/package-management/cabal-install/1.20.0.4.nix → pkgs/tools/package-management/cabal-install/1.20.0.6.nix
View File

@ -7,30 +7,26 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cabal-install"; pname = "cabal-install";
version = "1.20.0.4"; version = "1.20.0.6";
sha256 = "171lkr8jw5k3l58gn41jmbp47kf3b8iq9dds0v8qx7wxzlxy0kz1"; sha256 = "1hc187yzl59518cswk25xzsabn9dvm4wqpq817hmclrvkf4zr3pl";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
Cabal filepath HTTP mtl network networkUri random stm time zlib Cabal filepath HTTP mtl network networkUri random stm time zlib
]; ];
testDepends = [ testDepends = [
Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework Cabal filepath HTTP HUnit mtl network networkUri QuickCheck stm
testFrameworkHunit testFrameworkQuickcheck2 time zlib testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib
]; ];
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''
mkdir $out/etc mkdir $out/etc
mv bash-completion $out/etc/bash_completion.d mv bash-completion $out/etc/bash_completion.d
''; '';
patchPhase = ''
sed -i -e 's|random .*< 1.1,|random,|' cabal-install.cabal
'';
meta = { meta = {
homepage = "http://www.haskell.org/cabal/"; homepage = "http://www.haskell.org/cabal/";
description = "The command-line interface for Cabal and Hackage"; description = "The command-line interface for Cabal and Hackage";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ andres ];
}; };
}) })

8
pkgs/top-level/haskell-defaults.nix
View File

@ -15,7 +15,7 @@
# Older compilers inherit the overrides from newer ones. # Older compilers inherit the overrides from newer ones.
ghcHEADPrefs = self : super : super // { ghcHEADPrefs = self : super : super // {
cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; cabalInstall_1_20_0_6 = super.cabalInstall_1_20_0_6.override { Cabal = null; };
mtl = self.mtl_2_2_1; mtl = self.mtl_2_2_1;
ghcjsBase = null; ghcjsBase = null;
ghcjsDom = with self; super.ghcjsDom.override { ghcjsDom = with self; super.ghcjsDom.override {
@ -29,9 +29,9 @@
}; };
ghc784Prefs = self : super : ghcHEADPrefs self super // { ghc784Prefs = self : super : ghcHEADPrefs self super // {
cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; }; cabalInstall_1_20_0_6 = super.cabalInstall_1_20_0_6.override { Cabal = self.Cabal_1_20_0_3; };
codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_3; }; };
jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; }; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_3; };
MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x
mtl = self.mtl_2_1_3_1; mtl = self.mtl_2_1_3_1;
transformersCompat = super.transformersCompat.override { cabal = self.cabal.override { transformersCompat = super.transformersCompat.override { cabal = self.cabal.override {

10
pkgs/top-level/haskell-packages.nix
View File

@ -364,7 +364,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {};
Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {};
Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; Cabal_1_20_0_3 = callPackage ../development/libraries/haskell/Cabal/1.20.0.3.nix {};
Cabal_HEAD = callPackage ../development/libraries/haskell/Cabal/head.nix {}; Cabal_HEAD = callPackage ../development/libraries/haskell/Cabal/head.nix {};
Cabal = null; # core package since forever Cabal = null; # core package since forever
@ -3172,9 +3172,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { cabalBounds = callPackage ../development/tools/haskell/cabal-bounds {
Cabal = self.Cabal_1_20_0_2; Cabal = self.Cabal_1_20_0_3;
cabalLenses = self.cabalLenses.override { cabalLenses = self.cabalLenses.override {
Cabal = self.Cabal_1_20_0_2; Cabal = self.Cabal_1_20_0_3;
}; };
}; };
@ -3188,9 +3188,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; };
cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; };
cabalInstall_1_20_0_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; }; cabalInstall_1_20_0_6 = callPackage ../tools/package-management/cabal-install/1.20.0.6.nix { Cabal = self.Cabal_1_20_0_3; };
cabalInstall_HEAD = callPackage ../tools/package-management/cabal-install/head.nix { Cabal = self.Cabal_HEAD; }; cabalInstall_HEAD = callPackage ../tools/package-management/cabal-install/head.nix { Cabal = self.Cabal_HEAD; };
cabalInstall = self.cabalInstall_1_20_0_4; cabalInstall = self.cabalInstall_1_20_0_6;
codex = callPackage ../development/tools/haskell/codex {}; codex = callPackage ../development/tools/haskell/codex {};