Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub

Author: ocharles

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";
       };
     })
   );

builder/comp-builder.nix

@@ -419,7 +419,8 @@ let
 
     nativeBuildInputs =
       [ghc buildPackages.removeReferencesTo]
-      ++ executableToolDepends;
+      ++ executableToolDepends
+      ++ (lib.optional stdenv.hostPlatform.isGhcjs buildPackages.nodejs);
 
     outputs = ["out"]
       ++ (lib.optional keepConfigFiles "configFiles")

builder/hspkg-builder.nix

@@ -31,11 +31,13 @@ let
 
   cabalFile = if package-description-override == null || bundledSrc != null then null else package-description-override;
 
-  defaultSetupSrc = if stdenv.hostPlatform.isGhcjs then ./Setup.ghcjs.hs else ./Setup.hs;
+  # New GHC JS backend run emcc itself without the need for custom Setup.hs
+  oldGhcjs = stdenv.hostPlatform.isGhcjs && builtins.compareVersions ghc.version "9.10" < 0;
+  defaultSetupSrc = if oldGhcjs then ./Setup.ghcjs.hs else ./Setup.hs;
 
   setup = if package.buildType == "Simple"
     then
-      if stdenv.targetPlatform.isGhcjs # TODO probably should be hostPlatform, but only HsColour used to build ghc will change (updating will require rebuilding all the ghcjs versions)
+      if oldGhcjs
         then
           buildPackages.haskell-nix.nix-tools-unchecked.exes.default-setup-ghcjs // { exeName = "default-setup-ghcjs"; }
         else

ci.nix

@@ -73,7 +73,7 @@
         ghc96llvm = true;
         ghc98 = true;
         ghc98llvm = true;
-        ghc910X = true;
+        ghc910 = true;
         ghc911 = true;
       })));
   crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:

flake.lock

@@ -31,6 +31,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";

flake.nix

@@ -290,7 +290,7 @@ let
 
   ghcSrc = ghc.raw-src or ghc.buildGHC.raw-src;
 
-  fixPlatformString = x: builtins.replaceStrings ["-linux-gnu"] ["-linux"] x;
+  platformString = p: with p.parsed; "${cpu.name}-${vendor.name}-${kernel.name}";
 
   # Dummy `ghc` that uses the captured output
   dummy-ghc = evalPackages.writeTextFile {
@@ -341,10 +341,10 @@ let
                 then "ArchJavaScript"
               else throw "Unknown target arch ${pkgs.stdenv.targetPlatform.config}"
           }")'
-          echo ',("target platform string","${fixPlatformString pkgs.stdenv.targetPlatform.config}")'
-          echo ',("Build platform","${fixPlatformString pkgs.stdenv.buildPlatform.config}")'
-          echo ',("Host platform","${fixPlatformString pkgs.stdenv.hostPlatform.config}")'
-          echo ',("Target platform","${fixPlatformString pkgs.stdenv.targetPlatform.config}")'
+          echo ',("target platform string","${platformString pkgs.stdenv.targetPlatform}")'
+          echo ',("Build platform","${platformString pkgs.stdenv.buildPlatform}")'
+          echo ',("Host platform","${platformString pkgs.stdenv.hostPlatform}")'
+          echo ',("Target platform","${platformString pkgs.stdenv.targetPlatform}")'
           echo ']'
           ;;
         --print-libdir*)

lib/call-cabal-project-to-nix.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, haskellLib, buildPackages }:
-drv:
+let self = drv:
 
 let
   component = drv.config;
@@ -28,6 +28,8 @@ in stdenv.mkDerivation ((
 
   passthru = {
     inherit (drv) identifier config configFiles executableToolDepends cleanSrc env exeName;
+    profiled = self drv.profiled;
+    dwarf = self drv.dwarf;
   };
 
   inherit (drv) meta LANG LC_ALL buildInputs;
@@ -62,4 +64,5 @@ in stdenv.mkDerivation ((
   inherit (component) preCheck postCheck;
 }
 // lib.optionalAttrs (drv ? LOCALE_ARCHIVE) { inherit (drv) LOCALE_ARCHIVE; }
-)
+);
+in self