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

Update HEAD versions of Cabal and cabal-install version to 1.22.0.0.

This commit is contained in:
Peter Simons 2015-01-05 12:34:08 +01:00
parent a1c1be46e1
commit dc70244447
5 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix Normal file
View File

@ -0,0 +1,26 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, binary, deepseq, extensibleExceptions, filepath, HUnit
, QuickCheck, regexPosix, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, time
}:
cabal.mkDerivation (self: {
pname = "Cabal";
version = "1.22.0.0";
sha256 = "13984rli87vzhl5pvpny2cns8dq4k2s5bgmr8n93iw9hrx5w3j48";
buildDepends = [ binary deepseq filepath time ];
testDepends = [
binary extensibleExceptions filepath HUnit QuickCheck regexPosix
testFramework testFrameworkHunit testFrameworkQuickcheck2
];
doCheck = false;
preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "A framework for packaging Haskell software";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ simons ];
};
})

26
pkgs/development/libraries/haskell/Cabal/head.nix
View File

@ -1,26 +0,0 @@
{ cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
, random, stm, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, time, zlib, fetchgit
}:
cabal.mkDerivation (self: {
pname = "Cabal";
version = "HEAD";
src = fetchgit {
url = git://github.com/haskell/cabal.git;
rev = "699d4df12e1ec75e9100b521fb3690eaa6986635";
sha256 = "112wz0mq7b0hvlj69imnwja2n4kv75m49yy5y8924gik9801zjba";
};
preConfigure = "cd Cabal";
doCheck = false;
noHaddock = true;
buildDepends = [
filepath HTTP mtl network random stm time zlib QuickCheck
];
testDepends = [
filepath HTTP HUnit mtl network QuickCheck stm testFramework
testFrameworkHunit testFrameworkQuickcheck2 time zlib
];
})

34
pkgs/tools/package-management/cabal-install/1.22.0.0.nix Normal file
View File

@ -0,0 +1,34 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, extensibleExceptions, filepath, HTTP, HUnit, mtl
, network, networkUri, QuickCheck, random, regexPosix, stm
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
, zlib
}:
cabal.mkDerivation (self: {
pname = "cabal-install";
version = "1.22.0.0";
sha256 = "17cf2bkrxawjldhkq4hzlzlf7b2xqgkrzl7fa31whnnpni68v6jz";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network networkUri random stm time zlib
];
testDepends = [
Cabal extensibleExceptions filepath HTTP HUnit mtl network
networkUri QuickCheck regexPosix stm testFramework
testFrameworkHunit testFrameworkQuickcheck2 time zlib
];
doCheck = false;
postInstall = ''
mkdir $out/etc
mv bash-completion $out/etc/bash_completion.d
'';
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "The command-line interface for Cabal and Hackage";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

33
pkgs/tools/package-management/cabal-install/head.nix
View File

@ -1,33 +0,0 @@
{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
, random, stm, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, time, zlib, fetchgit
}:
cabal.mkDerivation (self: {
pname = "cabal-install";
version = "HEAD";
src = Cabal.src;
isLibrary = true;
isExecutable = true;
doCheck = false;
preConfigure = "cd cabal-install";
noHaddock = true;
buildDepends = [
Cabal filepath HTTP mtl network random stm time zlib
];
testDepends = [
Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework
testFrameworkHunit testFrameworkQuickcheck2 time zlib
];
postInstall = ''
mkdir $out/etc
mv bash-completion $out/etc/bash_completion.d
'';
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "The command-line interface for Cabal and Hackage";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -365,7 +365,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_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.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_1_22_0_0 = callPackage ../development/libraries/haskell/Cabal/1.22.0.0.nix {};
Cabal = null; # core package since forever
cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {};
@ -957,8 +957,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ghcid = callPackage ../development/tools/haskell/ghcid {};
ghcjs = callPackage ../development/compilers/ghcjs {
Cabal = self.Cabal_HEAD;
cabalInstall = self.cabalInstall_HEAD;
Cabal = self.Cabal_1_22_0_0;
cabalInstall = self.cabalInstall_1_22_0_0;
haddock = self.haddock.override {
Cabal = null;
};
@ -3197,8 +3197,8 @@ 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_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_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 = self.cabalInstall_1_20_0_6;
cabalInstall_1_22_0_0 = callPackage ../tools/package-management/cabal-install/1.22.0.0.nix { Cabal = self.Cabal_1_22_0_0; };
cabalInstall = self.cabalInstall_1_22_0_0;
codex = callPackage ../development/tools/haskell/codex {};