Merge remote-tracking branch 'origin/master' into armv7a

# Conflicts:
#	ci.nix

Author: hamishmack

ci.nix

@@ -18,8 +18,8 @@
 
   # short names for nixpkgs versions
   nixpkgsVersions = {
-    "unstable" = inputs.nixpkgs-unstable;
     "R2411" = inputs.nixpkgs-2411;
+    "unstable" = inputs.nixpkgs-unstable;
   };
 
   nixpkgsArgs = {
@@ -68,7 +68,7 @@
         ghc98llvm = false;
         ghc910 = true;
         ghc910llvm = true;
-        ghc9121 = true;
+        ghc912 = true;
         ghc912X = true;
         ghc913 = true;
       })));

flake.lock

@@ -110,7 +110,7 @@ final: prev: {
                 You may need to update haskell.nix to one that includes a newer stackage.nix.
                 '');
                 # The compiler referenced in the stack config
-                compiler = (stack-pkgs.extras hackage).compiler or (pkg-def hackage).compiler;
+                compiler = (stack-pkgs.extras hackageForStack).compiler or (pkg-def hackageForStack).compiler;
                 patchesModule = ghcHackagePatches.${compiler.nix-name} or {};
                 # Remove fake packages generated from stack keywords used in ghc-options
                 removeStackSpecial = module: if builtins.typeOf module == "set"
@@ -823,7 +823,7 @@ final: prev: {
             shellFor = shellArgs:
               let
                 # These are the args we will pass to the main shell.
-                args' = builtins.removeAttrs shellArgs [ "crossPlatforms" ];
+                args' = builtins.removeAttrs (rawProject.args.shell // shellArgs) [ "crossPlatforms" ];
                 # These are the args we will pass to the shells for the corss compiler
                 argsCross =
                   # These things should match main shell
@@ -847,7 +847,7 @@ final: prev: {
                 });
 
             # Default shell
-            shell = shellFor rawProject.args.shell;
+            shell = shellFor {};
 
             # Like `.hsPkgs.${packageName}` but when compined with `getComponent` any
             # cabal configure errors are defered until the components derivation builds.

overlays/haskell.nix

@@ -37,7 +37,7 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
       NIX_LDFLAGS = "--push-state --as-needed -lstdc++ --pop-state";
       # without this collate.icu.utf8, and foreign_data will fail.
       LC_CTYPE = "C";
-    })).override { enableSystemd = false; gssSupport = false; };
+    })).override { systemdSupport = false; gssSupport = false; };
 
   openssl = prev.openssl.override { static = true; };