diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-09 15:33:03 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-09 15:33:03 +0100 |
| commit | 4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d (patch) | |
| tree | 9d1a295c81982f3f6f7ebceb5171e7c6f08bc4eb /pkgs/build-support/cabal | |
| parent | 90b8267e7ba4f5268e0bd0ff47701a6abddd21f6 (diff) | |
| parent | 20710afb46b6fc341801c92e17ddb96cfdf4085c (diff) | |
| download | nixpkgs-4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d.tar nixpkgs-4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d.tar.gz nixpkgs-4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d.tar.bz2 nixpkgs-4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d.tar.lz nixpkgs-4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d.tar.xz nixpkgs-4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d.tar.zst nixpkgs-4cf52df32ebae9b05b6b4e8d9463f6ada3e62a8d.zip | |
Merge pull request #5663 from ryantrinkle/fix-cabal-js
Use Cabal_1_22_0_0 instead of Cabal_HEAD in cabalJs
Diffstat (limited to 'pkgs/build-support/cabal')
| -rw-r--r-- | pkgs/build-support/cabal/ghcjs.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cabal/ghcjs.nix b/pkgs/build-support/cabal/ghcjs.nix index 3d12c3efb11..8ae1746dc78 100644 --- a/pkgs/build-support/cabal/ghcjs.nix +++ b/pkgs/build-support/cabal/ghcjs.nix @@ -81,7 +81,7 @@ in # default buildInputs are just ghc, if more buildInputs are required # buildInputs can be extended by the client by using extraBuildInputs, # but often propagatedBuildInputs is preferable anyway - buildInputs = [ghc ghc.ghc.parent.Cabal_HEAD] ++ self.extraBuildInputs; + buildInputs = [ghc ghc.ghc.parent.Cabal_1_22_0_0] ++ self.extraBuildInputs; extraBuildInputs = self.buildTools ++ (optionals self.doCheck self.testDepends) ++ (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++ |