From 20710afb46b6fc341801c92e17ddb96cfdf4085c Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Fri, 9 Jan 2015 08:29:56 -0500 Subject: [PATCH] Use Cabal_1_22_0_0 instead of Cabal_HEAD in cabalJs Cabal_HEAD no longer exists. When Cabal_1_22_0_0 or later becomes the default, this should be updated again to point to Cabal --- pkgs/build-support/cabal/ghcjs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]) ++