Merge remote-tracking branch 'origin/qa' into eac@ob-hoogle
commit443dbd76104045bc2d60ebf9bc0f279890e1e2cb
authorElliot Cameron <eacameron@gmail.com>
dateTue 28 Jan 2020, 12:34 (7 years ago)
parent4bbe7bb256428d
default.nix+1−1
@@ -324,7 +324,7 @@ in rec {
324324 } // self.userSettings.ios;
325325 };
326326
327− shells-ghc = builtins.attrNames self.shellPackages;
327+ shells-ghc = builtins.attrNames (self.predefinedPackages // self.shellPackages);
328328
329329 shells-ghcjs = [
330330 self.frontendName