Merge remote-tracking branch 'origin/master' into hkm/wasm

# Conflicts:
#	test/cabal.project.local

Author: hamishmack

builder/comp-builder.nix

@@ -385,7 +385,6 @@ let
       env = shellWrappers.drv;
       shell = drv.overrideAttrs (attrs: {
         pname = nameOnly + "-shell";
-        inherit (package.identifier) version;
         nativeBuildInputs = [shellWrappers.drv] ++ attrs.nativeBuildInputs;
       });
       profiled = lib.makeOverridable self (drvArgs // { enableLibraryProfiling = true; });

flake.lock

@@ -1,22 +1,22 @@
-pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.5/"; in {
+pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.8/"; in {
   aarch64-darwin = pkgs.fetchurl { 
      name = "aarch64-darwin-nix-tools-static";
      url = "${baseurl}aarch64-darwin-nix-tools-static.zip";
-     sha256 = "sha256-umzS70a8h1pigTzBJdkChEPqIk83NXfi02zIDQIDrzI=";
+     sha256 = "sha256-v3lxSxCDjQWtCSwx9T5lzcufByvFErKGLm8374KYsOs=";
   };
   x86_64-darwin = pkgs.fetchurl { 
      name = "x86_64-darwin-nix-tools-static";
      url = "${baseurl}x86_64-darwin-nix-tools-static.zip";
-     sha256 = "sha256-O0T0tI+vD5ZuozKvqlfQR93UO6p4P0HyPQDLvhUIChs=";
+     sha256 = "sha256-Ltze09JIiUpMuy+jfoSghejmZ3L4NCpgr32LyX5bckU=";
   };
   aarch64-linux = pkgs.fetchurl { 
      name = "aarch64-linux-nix-tools-static";
      url = "${baseurl}aarch64-linux-nix-tools-static.zip";
-     sha256 = "sha256-J3z5WbEm96k25UyOK3kKRtecQvTQIORRhoROKFSULZI=";
+     sha256 = "sha256-bpjuragBvzuki4CVleXyqTrQfRJshdoTeD3v6xl9sio=";
   };
   x86_64-linux = pkgs.fetchurl { 
      name = "x86_64-linux-nix-tools-static";
      url = "${baseurl}x86_64-linux-nix-tools-static.zip";
-     sha256 = "sha256-CKf8Drj1UOwlAg16S4kuyVp25O7al/5YzxwrLawVnwQ=";
+     sha256 = "sha256-aZOmrhp+AdCXcBaNVAeJHDobBaGzJDvEhY90mWjGadc=";
   };
 }

nix-tools-static.nix

@@ -454,6 +454,9 @@ instance {-# OVERLAPS #-} ToNixExpr a => ToNixExpr [a] where
 fixSystem :: String -> String
 fixSystem "isJavascript" = "isJavaScript"
 fixSystem "isDragonfly" = "isDragonFly"
+fixSystem "isHpux" = "isHPUX"
+fixSystem "isIos" = "isIOS"
+fixSystem "isIrix" = "isIRIX"
 fixSystem s = s
 
 instance ToNixExpr ConfVar where

nix-tools/flake.lock

@@ -22,7 +22,7 @@ repository head.hackage.ghc.haskell.org
      f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
      26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
      7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-  --sha256: sha256-7avwPG/Y1/+n48FFoWXiRtV/JqSPGvPqfHGLVG7ANk4=
+  --sha256: sha256-s9Y1s9aodiq9zbUOPhY32WNoK7GH5NtKD9esgkM0LzQ=
 
 repository ghcjs-overlay
   url: https://github.com/raw/input-output-hk/hackage-overlay-ghcjs/ffb32dce467b9a4d27be759fdd2740a6edd09d0b