From b8a6e4d2dc51a6d8a018f56cea87eb3d63f5111f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Apr 2012 17:41:57 +0000 Subject: [PATCH] haskell-cabal-install: added version 0.14.0 svn path=/nixpkgs/trunk/; revision=33819 --- .../cabal-install/0.14.0.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/package-management/cabal-install/0.14.0.nix diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix new file mode 100644 index 000000000000..ecbd46de52c2 --- /dev/null +++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix @@ -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 ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 57ac9d8f0a67..df43536a8b76 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -157,7 +157,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 {};