Author: simons
Date: Tue Feb 14 16:58:56 2012
New Revision: 32288
URL: https://nixos.org/websvn/nix/?rev=32288&sc=1
Log:
haskell-packages.nix: allow packages to be built with a version of 'Cabal'
other than the one shipped with the compiler
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/Cabal/
nixpkgs/trunk/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Cabal/1.14.0.nix Tue Feb
14 16:58:56 2012 (r32288)
@@ -0,0 +1,18 @@
+{ cabal, Cabal, filepath }:
+
+cabal.mkDerivation (self: {
+ pname = "Cabal";
+ version = "1.14.0";
+ sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j";
+ buildDepends = [ Cabal filepath ];
+ 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 = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Feb 14 16:58:53
2012 (r32287)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Feb 14 16:58:56
2012 (r32288)
@@ -119,8 +119,7 @@
};
# This is the Cabal builder, the function we use to build most Haskell
- # packages. It isn't the Cabal library, which is a core package of GHC
- # and therefore not separately listed here.
+ # packages. It isn't the Cabal library, which is spelled "Cabal".
cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {
enableLibraryProfiling = enableLibraryProfiling;
@@ -505,6 +504,9 @@
bytestringTrie = callPackage
../development/libraries/haskell/bytestring-trie {};
+ Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix
{};
+ Cabal = null; # core package in GHC
+
cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
cairo = callPackage ../development/libraries/haskell/cairo {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
