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

Author: ocharles

.github/workflows/updates.yml

@@ -18,8 +18,8 @@ jobs:
             substituters = https://cache.iog.io https://cache.zw3rk.com https://cache.nixos.org/
       - name: "Update pins"
         run: |
-          nix flake lock --update-input hackage
-          nix flake lock --update-input stackage
+          nix flake update hackage
+          nix flake update stackage
       - name: Commit and push changes
         run: |
           git config --local user.email "[email protected]"

ci.nix

@@ -68,7 +68,9 @@
         ghc92 = true;
         ghc94 = true;
         ghc96 = true;
+        ghc96llvm = true;
         ghc98 = true;
+        ghc98llvm = true;
         ghc98X = true;
         ghc99 = true;
       })));
@@ -77,17 +79,20 @@
     # of 'lib.systems.examples' are not understood between all versions
     let lib = nixpkgs.lib;
     in lib.optionalAttrs (nixpkgsName == "unstable"
+      && (__match ".*llvm" compiler-nix-name == null)
       && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
        || (system == "aarch64-linux" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
        || (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
        || (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
        )) {
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (nixpkgsName == "unstable"
+      && (__match ".*llvm" compiler-nix-name == null)
       && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc884"])
        || (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) mingwW64;
   } // lib.optionalAttrs (nixpkgsName == "unstable"
+      && (__match ".*llvm" compiler-nix-name == null)
       && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc884" "ghc8107" "ghc902" "ghc928"])
        || (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) ucrt64;

compiler/ghc/default.nix

@@ -354,7 +354,7 @@ let
 in
 stdenv.mkDerivation (rec {
   version = ghc-version;
-  name = "${targetPrefix}ghc-${version}";
+  name = "${targetPrefix}ghc-${version}" + lib.optionalString (useLLVM) "-llvm";
 
   inherit src configureFlags;
   patches = ghc-patches;
@@ -754,7 +754,7 @@ stdenv.mkDerivation (rec {
       --replace 'dynamic-library-dirs:' 'dynamic-library-dirs: ${libcxx}/lib ${libcxxabi}/lib'
     find . -name 'system*.conf*'
     cat mk/system-cxx-std-lib-1.0.conf
-  '' + lib.optionalString (installStage1 && stdenv.targetPlatform.isMusl) ''
+  '' + lib.optionalString (installStage1 && !haskell-nix.haskellLib.isCrossTarget && stdenv.targetPlatform.isMusl) ''
     substituteInPlace hadrian/cfg/system.config \
       --replace 'cross-compiling       = YES' \
                 'cross-compiling       = NO'

docs/dev/nix-tools-pin.md

@@ -2,7 +2,7 @@
 
 1. Use niv to update the sources.json:
    ```shell
-   nix flake lock --update-input nix-tools
+   nix flake update nix-tools
    ```
 
 2. If `nix-tools.cabal` or `plan-to-nix` have changed, check the