diff options
author | Peter Simons <simons@cryp.to> | 2019-08-23 16:49:38 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2019-08-23 16:50:30 +0200 |
commit | ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1 (patch) | |
tree | 57b298287260c96b0c2a6a1ba9a6e7547cf78aa3 /pkgs/development/haskell-modules | |
parent | 826b492dc35e53376fb24f6853897f8ccaeda7c9 (diff) | |
download | nixlib-ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1.tar nixlib-ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1.tar.gz nixlib-ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1.tar.bz2 nixlib-ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1.tar.lz nixlib-ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1.tar.xz nixlib-ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1.tar.zst nixlib-ddfb9a1f2c5d1a82c54ea303d69c2caebdaad7e1.zip |
Add a build for cabal-install-3.0.0.0 beta release.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 27 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/non-hackage-packages.nix | 40 |
2 files changed, 43 insertions, 24 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index dc3071e5fab3..417fc0b3a441 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,30 +41,9 @@ self: super: { unix = null; xhtml = null; - # Use the current git version of cabal-install. - cabal-install = overrideCabal (super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal-git; })) (drv: { - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386"; - sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i"; - }; - version = "20190510-git"; - editedCabalFile = null; - postUnpack = "sourceRoot+=/cabal-install"; - jailbreak = true; - }); - Cabal-git = overrideCabal super.Cabal_2_4_1_0 (drv: { - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "cabal"; - rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386"; - sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i"; - }; - version = "20190510-git"; - editedCabalFile = null; - postUnpack = "sourceRoot+=/Cabal"; - }); + # Use the cabal-install 3.0.0.0 beta release. + cabal-install = self.cabal-install-3; + Cabal_3_0_0_0 = null; # Our compiler has this already. # Ignore overly restrictive upper version bounds. async = doJailbreak super.async; diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index b7b057f2dc20..1793299bf6cd 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -12,4 +12,44 @@ self: super: { # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + + cabal-install-3 = (self.callPackage + ({ mkDerivation, array, async, base, base16-bytestring, binary + , bytestring, Cabal, containers, cryptohash-sha256, deepseq + , directory, echo, edit-distance, filepath, hackage-security + , hashable, HTTP, mtl, network, network-uri, parsec, pretty + , process, random, resolv, stdenv, stm, tar, text, time, unix, zlib + , fetchFromGitHub + }: + mkDerivation { + pname = "cabal-install"; + version = "3.0.0.0"; + src = fetchFromGitHub { + owner = "haskell"; + repo = "cabal"; + rev = "b0e52fa173573705e861b129d9675e59de891e46"; + sha256 = "1fbph6crsn9ji8ps1k8dsxvgqn38rp4ffvv6nia1y7rbrdv90ass"; + }; + postUnpack = "sourceRoot+=/cabal-install"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath process ]; + executableHaskellDepends = [ + array async base base16-bytestring binary bytestring Cabal + containers cryptohash-sha256 deepseq directory echo edit-distance + filepath hackage-security hashable HTTP mtl network network-uri + parsec pretty process random resolv stm tar text time unix zlib + ]; + doCheck = false; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + ''; + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + license = stdenv.lib.licenses.bsd3; + }) {}).overrideScope (self: super: { + Cabal = self.Cabal_3_0_0_0; + }); + } |