Merge remote-tracking branch 'origin/master' into hkm/embed-file

# Conflicts:
#	test/default.nix

Author: hamishmack

builder/comp-builder.nix

@@ -418,7 +418,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

flake.lock

@@ -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