Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update

# Conflicts:
#	overlays/bootstrap.nix

Author: hamishmack

build.nix

@@ -26,7 +26,11 @@ in rec {
 
   tools = pkgs.lib.optionalAttrs (ifdLevel >= 3) (
     pkgs.recurseIntoAttrs ({
-      cabal-latest = tool compiler-nix-name "cabal" { inherit evalPackages; };
+      cabal-latest = tool compiler-nix-name "cabal" ({
+        inherit evalPackages;
+      } // pkgs.lib.optionalAttrs (ghcFromTo "9.10" "9.12") {
+        cabalProjectLocal = builtins.readFile ./test/cabal.project.local;
+      });
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.8" < 0) {
       hlint-latest = tool compiler-nix-name "hlint" {
         inherit evalPackages;
@@ -58,10 +62,10 @@ in rec {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.10") {
-      "hls-27" = tool compiler-nix-name "haskell-language-server" {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.9") {
+      "hls-28" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.7";
+        src = pkgs.haskell-nix.sources."hls-2.8";
       };
     })
   );

ci.nix

@@ -1,6 +1,6 @@
 # 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating
 # on a machine with e.g. no way to build the Darwin IFDs you need!
-{ ifdLevel ? 3
+{ ifdLevel # This is passed in from flake.nix
 , checkMaterialization ? false
 , system ? builtins.currentSystem
 , evalSystem ? builtins.currentSystem or "x86_64-linux"
@@ -73,7 +73,7 @@
         ghc96llvm = true;
         ghc98 = true;
         ghc98llvm = true;
-        ghc910X = true;
+        ghc910 = true;
         ghc911 = true;
       })));
   crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
@@ -149,7 +149,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
         // pkgs.lib.optionalAttrs (ifdLevel >= 2 && crossSystemName != "ghcjs")
             pkgs.haskell-nix.iserv-proxy-exes.${compiler-nix-name}
         // pkgs.lib.optionalAttrs (ifdLevel >= 3) {
-          hello = (pkgs.haskell-nix.hackage-package { name = "hello"; version = "1.0.0.2"; inherit compiler-nix-name; }).getComponent "exe:hello";
+          hello = (pkgs.haskell-nix.hackage-package { name = "hello"; version = "1.0.0.2"; inherit evalPackages compiler-nix-name; }).getComponent "exe:hello";
         })
       ))
     )

compiler/ghc/default.nix

@@ -633,6 +633,17 @@ stdenv.mkDerivation (rec {
     # We could add `configured-src` as an output of the ghc derivation, but
     # having it as its own derivation means it can be accessed quickly without
     # building GHC.
+    raw-src = stdenv.mkDerivation {
+      name = name + "-raw-src";
+      inherit
+        version
+        patches
+        src;
+      installPhase = ''
+        cp -r . $out
+      '';
+      phases = [ "unpackPhase" "patchPhase" "installPhase"];
+    };
     configured-src = stdenv.mkDerivation ({
       name = name + "-configured-src";
       inherit

flake.lock

@@ -28,6 +28,7 @@
     "hls-2.5" = { url = "github:haskell/haskell-language-server/2.5.0.0"; flake = false; };
     "hls-2.6" = { url = "github:haskell/haskell-language-server/2.6.0.0"; flake = false; };
     "hls-2.7" = { url = "github:haskell/haskell-language-server/2.7.0.0"; flake = false; };
+    "hls-2.8" = { url = "github:haskell/haskell-language-server/2.8.0.0"; flake = false; };
     hydra.url = "hydra";
     hackage = {
       url = "github:input-output-hk/hackage.nix";
@@ -94,6 +95,7 @@
     let
       callFlake = import flake-compat;
 
+      ifdLevel = 3;
       compiler = "ghc928";
       config = import ./config.nix;
 
@@ -205,7 +207,7 @@
         stripAttrsForHydra (filterDerivations (
           # This is awkward.
           import ./ci.nix {
-            inherit system;
+            inherit ifdLevel system;
             haskellNix = self;
           })));
 
@@ -247,7 +249,9 @@
             };
             in cf.defaultNix.hydraJobs;
         in
-        self.allJobs.${system} // { nix-tools = nix-tools-hydraJobs.${system} or {}; }
+        self.allJobs.${system}
+          // lib.optionalAttrs (ifdLevel > 2)
+            { nix-tools = nix-tools-hydraJobs.${system} or {}; }
       );
 
       devShells = forEachSystemPkgs (pkgs:
@@ -281,7 +285,7 @@
                 "ghc921" "ghc922" "ghc923"])
       );
     }; in with (import nixpkgs { system = "x86_64-linux"; });
-          traceHydraJobs (lib.recursiveUpdate flake {
+          traceHydraJobs (lib.recursiveUpdate flake (lib.optionalAttrs (ifdLevel > 2) {
             hydraJobs.nix-tools = pkgs.releaseTools.aggregate {
               name = "nix-tools";
               constituents = [
@@ -296,7 +300,7 @@
                 (writeText "gitrev" (self.rev or "0000000000000000000000000000000000000000"))
               ];
             };
-          });
+          }));
 
   # --- Flake Local Nix Configuration ----------------------------
   nixConfig = {