diff options
| author | Peter Simons <simons@cryp.to> | 2013-09-06 13:11:23 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-09-06 23:35:10 +0200 |
| commit | 880ca8abbc118a2e6c301cfd1f16b0309488c96e (patch) | |
| tree | 54732cb3ac7eae46545b3187e4233459e24edd22 | |
| parent | 9ed90073b35b62f97152f5134b59b975ef59d7c5 (diff) | |
| download | nixpkgs-880ca8abbc118a2e6c301cfd1f16b0309488c96e.tar nixpkgs-880ca8abbc118a2e6c301cfd1f16b0309488c96e.tar.gz nixpkgs-880ca8abbc118a2e6c301cfd1f16b0309488c96e.tar.bz2 nixpkgs-880ca8abbc118a2e6c301cfd1f16b0309488c96e.tar.lz nixpkgs-880ca8abbc118a2e6c301cfd1f16b0309488c96e.tar.xz nixpkgs-880ca8abbc118a2e6c301cfd1f16b0309488c96e.tar.zst nixpkgs-880ca8abbc118a2e6c301cfd1f16b0309488c96e.zip | |
cabal-install: add version 1.18.0
| -rw-r--r-- | pkgs/tools/package-management/cabal-install/1.18.0.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 5 |
2 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.nix b/pkgs/tools/package-management/cabal-install/1.18.0.nix new file mode 100644 index 00000000000..8b093bc925c --- /dev/null +++ b/pkgs/tools/package-management/cabal-install/1.18.0.nix @@ -0,0 +1,30 @@ +{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck +, random, stm, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, time, zlib +}: + +cabal.mkDerivation (self: { + pname = "cabal-install"; + version = "1.18.0"; + sha256 = "14c4i8cy2rnvjj2krv3swna53k2674xhpzqkmcr56lxnyzych5wh"; + isLibrary = false; + isExecutable = 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 ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c9c1cc6076f..2b69370e38b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -173,7 +173,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x vector = self.vector_0_10_0_1; xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_16_0_2; + cabalInstall = self.cabalInstall_1_18_0; alex = self.alex_3_0_5; haddock = self.haddock_2_13_2; happy = self.happy_1_18_10; @@ -2368,7 +2368,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; - cabalInstall = self.cabalInstall_1_16_0_2; + cabalInstall_1_18_0 = callPackage ../tools/package-management/cabal-install/1.18.0.nix {}; + cabalInstall = self.cabalInstall_1_18_0; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; |