Bump nixpkgs pins (input-output-hk#1930)

Update the nixpkgs pins to keep them up to date and to help catch issues that arise when using newer versions.

This PR includes fixes and work arounds for a number that came up when nixpkgs was updated:

* GHC 9.6.1 is now included in nixpkgs, but the package database locations and formats are different enough that compiling tools with it does not work.  The work around is not to use this version of GHC from nixpkgs for now.
* Autoreconf now has a newer `config.sub` and this broke a couple of things.  It overwrote the version used for GHC 9.6.1 (which included ghcjs) and it broke the library patches in ghcjs 8.10.7.
* We included a work around for a openssl windows cross compilation issue (also fixed it upstream NixOS/nixpkgs#229465).
* -optc-mno-outline-atomics was added for lGHC builds targeting aarch64 linux that now use ghc 12

Author: hamishmack

builder/comp-builder.nix

@@ -200,7 +200,11 @@ let
       ++ lib.optional stdenv.hostPlatform.isLinux (enableFeature enableDeadCodeElimination "split-sections")
       ++ lib.optionals haskellLib.isCrossHost (
         map (arg: "--hsc2hs-option=" + arg) (["--cross-compile"] ++ lib.optionals (stdenv.hostPlatform.isWindows) ["--via-asm"])
-        ++ lib.optional (package.buildType == "Configure") "--configure-option=--host=${stdenv.hostPlatform.config}" )
+        ++ lib.optional (package.buildType == "Configure") "--configure-option=--host=${
+           # Older ghcjs patched config.sub to support "js-unknown-ghcjs" (not "javascript-unknown-ghcjs")
+           if stdenv.hostPlatform.isGhcjs && builtins.compareVersions defaults.ghc.version "9" < 0
+             then "js-unknown-ghcjs"
+             else stdenv.hostPlatform.config}" )
       ++ configureFlags
       ++ (ghc.extraConfigureFlags or [])
       ++ lib.optional enableDebugRTS "--ghc-option=-debug"

compiler/ghc/default.nix

@@ -275,7 +275,20 @@ let
           + lib.optionalString useLLVM "+llvm"
           + lib.optionalString enableDWARF "+debug_info"
           + lib.optionalString targetPlatform.isGhcjs "+native_bignum+no_profiled_libs"
-      } --docs=no-sphinx -j --verbose";
+      } --docs=no-sphinx -j --verbose"
+      # This is needed to prevent $GCC from emitting out of line atomics.
+      # Those would then result in __aarch64_ldadd1_sync and others being referenced, which
+      # we don't handle in the RTS properly yet. Until we figure out how to _properly_ deal
+      # with the RTS_SYMBOLS in GHC, we are better off disableing the out of line atomics.
+      + lib.optionalString ( hostPlatform.isAarch64 && targetPlatform.isLinux && targetPlatform.isAarch64)
+        " '*.*.ghc.c.opts += -optc-mno-outline-atomics'"
+      # For cross compilers only the RTS should be built with -mno-outline-atomics
+      + lib.optionalString (!hostPlatform.isAarch64 && targetPlatform.isLinux && targetPlatform.isAarch64)
+        " '*.rts.ghc.c.opts += -optc-mno-outline-atomics'"
+      # The following is required if we build on aarch64-darwin for aarch64-iOS. Otherwise older 
+      # iPhones/iPads/... won't understand the compiled code, as the compiler will emit LDSETALH
+      # + lib.optionalString (targetPlatform.???) "'*.rts.ghc.c.opts += -optc-mcpu=apple-a7 -optc-march=armv8-a+norcpc'"
+      ;
 
   # When installation is done by copying the stage1 output the directory layout
   # is different.
@@ -319,7 +332,7 @@ stdenv.mkDerivation (rec {
 
   # configure was run by configured-src already.
   phases = [ "unpackPhase" "patchPhase" ]
-            ++ lib.optional (ghc-patches != []) "autoreconfPhase"
+            ++ lib.optional (ghc-patches != [] && !stdenv.targetPlatform.isGhcjs) "autoreconfPhase" # autoreconf can replace config.sub with one that is missing ghcjs
             ++ [ "configurePhase" "buildPhase"
              "checkPhase" "installPhase"
              "fixupPhase"

flake.lock

@@ -2552,10 +2552,10 @@ pkgs:
     "libavc1394" = [ "libavc1394" ];
     "libavif" = [ "libavif" ];
     "ayatana-appindicator3-0.1" = [ "libayatana-appindicator" ];
-    "ayatana-appindicator-0.1" = [ "libayatana-appindicator-gtk2" ];
+#    "ayatana-appindicator-0.1" = [ "libayatana-appindicator-gtk2" ];
 #    "ayatana-appindicator3-0.1" = [ "libayatana-appindicator-gtk3" ];
     "ayatana-indicator3-0.4" = [ "libayatana-indicator" ];
-    "ayatana-indicator-0.4" = [ "libayatana-indicator-gtk2" ];
+#    "ayatana-indicator-0.4" = [ "libayatana-indicator-gtk2" ];
 #    "ayatana-indicator3-0.4" = [ "libayatana-indicator-gtk3" ];
     "libb2" = [ "libb2" ];
     "baseencode" = [ "libbaseencode" ];

lib/pkgconf-nixpkgs-map.nix

@@ -1033,7 +1033,10 @@ in {
     cabal-install-tool = {compiler-nix-name, ...}@args:
       (final.haskell-nix.tool compiler-nix-name "cabal" ({pkgs, ...}: {
         evalPackages = pkgs.buildPackages;
-        compilerSelection = p: p.haskell-nix.compiler // p.haskell.compiler;
+        compilerSelection = p: p.haskell-nix.compiler // p.haskell.compiler
+          # Avoid ghc961 from nixpkgs for now as the files in it are not
+          # where we expect them.
+          // { inherit (p.haskell-nix.compiler) ghc961; };
         version = "3.8.1.0";
         index-state = final.haskell-nix.internalHackageIndexState;
         materialized = ../materialized + "/${compiler-nix-name}/cabal-install";

overlays/bootstrap.nix

@@ -13,11 +13,17 @@ final: prev:
         # Apply the patches that came with `ghcjs`
         # Also add a "Keep alive" message to prevent hydra timeouts when hsc2hs runs
         packages = pkgs.lib.genAttrs (pkgs.lib.optionals (__elem config.compiler.nix-name ["ghc865" "ghc884" "ghc8107"]) ["base" "directory" "filepath" "ghc-prim" "integer-gmp" "process" "template-haskell" "time" "unix" "Win32" ])
-          (name: {
+          (name: let
+              ghcjs-src = pkgs.buildPackages.haskell-nix.compiler.${config.compiler.nix-name}.project.configured-src;
+              # This src derivation is needed for the unpatched config.sub file
+              # (the config.sub in the hackage is too old and the one created by autoreconf is too new for the patch).
+              ghcjs-src' = pkgs.buildPackages.haskell-nix.compiler.${config.compiler.nix-name}.configured-src;
+            in {
             components.library.preConfigure = ''
               tr -d '\r' < ${name}.cabal > ${name}.cabal-new
               mv ${name}.cabal-new ${name}.cabal
-              patch -p3 < ${pkgs.buildPackages.haskell-nix.compiler.${config.compiler.nix-name}.project.configured-src}/lib/patches/${name}.patch
+              if [[ -e config.sub ]]; then cp ${ghcjs-src'}/config.sub config.sub; fi
+              patch -p3 < ${ghcjs-src}/lib/patches/${name}.patch
             '';
             components.library.preBuild = ''
               # Avoid timeouts while unix package runs hsc2hs (it does not print anything

overlays/ghcjs.nix

@@ -4,17 +4,15 @@
 # and not end up with the expected changes we want.
 final: prev:
 {
-   # on windows we have this habit of putting libraries
-   # into `bin`, whereas on unix it's usually `lib`. For
-   # this confuses nix easily. So we'll just move the
-   # .dll's from `bin` into `$out/lib`. Such that they
-   # are trivially found.
-  #  openssl = prev.openssl.overrideAttrs (drv: {
-  #   #  postInstall = with prev.stdenv; drv.postInstall + lib.optionalString hostPlatform.isWindows ''
-  #   #    cp $bin/bin/*.dll $out/lib/
-  #   #  '';
-  #   postFixup = "";
-  #  });
+  # Work around for https://github.com/NixOS/nixpkgs/pull/229465
+  openssl = if !prev.stdenv.hostPlatform.isWindows then prev.openssl else prev.openssl.overrideAttrs (drv: {
+    nativeBuildInputs = final.lib.filter (x: x.name or "" != "make-shell-wrapper-hook") drv.nativeBuildInputs;
+    postInstall = ''
+      function makeWrapper () {
+        echo Skipping makeWrapper
+      }
+    '' + drv.postInstall;
+  });
 } // prev.lib.optionalAttrs (prev ? mfpr) {
    mfpr = if !prev.stdenv.hostPlatform.isWindows then prev.mpfr else prev.mfpr.overrideAttrs (drv: {
      configureFlags = (drv.configureFlags or []) ++ [ "--enable-static --disable-shared" ];