Merge pull request #27665 from jb55/fix/ghc821-inf-loop

jailbreak-cabal: specifically use ghc802 override in ghc821 config
This commit is contained in:
Peter Simons 2017-07-26 19:55:04 +02:00 committed by GitHub
commit 81e998bf0c
2 changed files with 2 additions and 2 deletions

View file

@ -248,7 +248,7 @@
jammerful = "jammerful <jammerful@gmail.com>";
jansol = "Jan Solanti <jan.solanti@paivola.fi>";
javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
jb55 = "William Casarin <bill@casarin.me>";
jb55 = "William Casarin <jb55@jb55.com>";
jbedo = "Justin Bedő <cu@cua0.org>";
jcumming = "Jack Cummings <jack@mudshark.org>";
jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>";

View file

@ -40,7 +40,7 @@ self: super: {
cabal-install = super.cabal-install.override { Cabal = null; };
# jailbreak-cabal doesn't seem to work right with the native Cabal version.
jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal;
jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {