mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
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
This commit is contained in:
parent
f8bd5bb401
commit
20710afb46
@ -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]) ++
|
||||
|
Loading…
Reference in New Issue
Block a user