From d680c2352c7d7b12ef7f5b9404df494c068dd1f4 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 26 Jul 2017 10:41:39 -0700 Subject: [PATCH 1/2] jailbreak-cabal: specifically use ghc802 override in ghc821 config Otherwise this will infinite loop when: pkgs.haskellPackages = pkgs.haskell.packages.ghc821 --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 8e18435c0c4..b29a1820d49 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -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 { From 77e9a04a2bc2a898b7236ec8c3a8ac9679c9d8ae Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 26 Jul 2017 10:44:12 -0700 Subject: [PATCH 2/2] maintainers: update my(jb55) email --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e10136bf070..a80b7c41a00 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -248,7 +248,7 @@ jammerful = "jammerful "; jansol = "Jan Solanti "; javaguirre = "Javier Aguirre "; - jb55 = "William Casarin "; + jb55 = "William Casarin "; jbedo = "Justin Bedő "; jcumming = "Jack Cummings "; jdagilliland = "Jason Gilliland ";