Author: simons
Date: Tue Apr 17 17:41:57 2012
New Revision: 33819
URL: https://nixos.org/websvn/nix/?rev=33819&sc=1

Log:
haskell-cabal-install: added version 0.14.0

Added:
   nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.14.0.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Added: nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.14.0.nix
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.14.0.nix        
Tue Apr 17 17:41:57 2012        (r33819)
@@ -0,0 +1,19 @@
+{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "0.14.0";
+  sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random time zlib
+  ];
+  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 ];
+  };
+})

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Apr 17 17:12:56 
2012        (r33818)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Tue Apr 17 17:41:57 
2012        (r33819)
@@ -157,7 +157,7 @@
     transformers = self.transformers_0_2_2_0;   # 7.4.1 ok
     mtl          = self.mtl_2_0_1_0;            # 7.4.1 ok
     random       = self.random_1_0_1_1;         # 7.4.1 ok
-    cabalInstall = self.cabalInstall_0_10_2;    # 7.4.1 fails
+    cabalInstall = self.cabalInstall_0_14_0;    # 7.4.1 ok
     alex         = self.alex_3_0_1;             # 7.4.1 ok
     happy        = self.happy_1_18_9;           # 7.4.1 ok
     haddock      = self.haddock_2_10_0;         # 7.4.1 ok
@@ -1666,7 +1666,8 @@
   cabalInstall_0_8_0  = callPackage 
../tools/package-management/cabal-install/0.8.0.nix  {};
   cabalInstall_0_8_2  = callPackage 
../tools/package-management/cabal-install/0.8.2.nix  {};
   cabalInstall_0_10_2 = callPackage 
../tools/package-management/cabal-install/0.10.2.nix {};
-  cabalInstall = self.cabalInstall_0_6_2;
+  cabalInstall_0_14_0 = callPackage 
../tools/package-management/cabal-install/0.14.0.nix {};
+  cabalInstall = self.cabalInstall_0_14_0;
 
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to