Merge remote-tracking branch 'upstream/master' into mpj/bump-haskell-nix

Author: michaelpj

.github/workflows/pipeline.yml

@@ -239,7 +239,7 @@ jobs:
       - name: "Check hix -- run github:haskell/cabal/3.10#cabal-install:exe:cabal -- --version"
         run: "HIX_DIR=$(mktemp -d) nix run .#hix --accept-flake-config -- run github:haskell/cabal/3.10#cabal-install:exe:cabal --accept-flake-config --override-input haskellNix . -- --version"
 
-  nix-tools:
+  check-nix-tools:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4

.github/workflows/update-docs.yml

@@ -0,0 +1,36 @@
+name: Updload Docs
+
+on:
+  push:
+    branches:
+      - master
+
+env:
+  GH_TOKEN: ${{ github.token }}
+
+jobs:
+  upload-docs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Nix with good defaults
+        uses: input-output-hk/install-nix-action@v20
+        with:
+          extra_nix_config: |
+            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= loony-tools:pr9m4BkM/5/eSTZlkQyRt57Jz7OMBxNSUiMC4FkcNfk=
+            substituters = https://cache.nixos.org/ https://cache.iog.io/ https://cache.zw3rk.com
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Update docs
+        run: |
+          nix-build build.nix -A maintainer-scripts.update-docs -o update-docs.sh
+          ./update-docs.sh
+
+      - name: Upload docs
+        run: |
+          git config --global user.name 'Auto Update Bot'
+          git config --global user.email '[email protected]'
+          git push origin gh-pages

.github/workflows/upload-artifacts.yml

@@ -1,4 +1,4 @@
-name: Wait for Hydra Build
+name: Update Static Nix Tools
 
 on:
   push:

build.nix

@@ -57,10 +57,10 @@ in rec {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.10.2") {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.13") {
       "hls" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.10";
+        src = pkgs.haskell-nix.sources."hls-2.11";
       };
     })
   );

builder/comp-builder.nix

@@ -1,4 +1,4 @@
-{ pkgs, stdenv, buildPackages, pkgsBuildBuild, ghc, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, haddockBuilder, ghcForComponent, hsPkgs, compiler, runCommand, libffi, gmp, windows, zlib, ncurses, nodejs, nonReinstallablePkgs }@defaults:
+{ pkgs, stdenv, buildPackages, pkgsBuildBuild, ghc, llvmPackages, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, haddockBuilder, ghcForComponent, hsPkgs, compiler, runCommand, libffi, gmp, windows, zlib, ncurses, nodejs, nonReinstallablePkgs }@defaults:
 lib.makeOverridable (
 let self =
 { componentId
@@ -383,7 +383,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; });
@@ -431,7 +430,8 @@ let
     nativeBuildInputs =
       [ghc buildPackages.removeReferencesTo]
       ++ executableToolDepends
-      ++ (lib.optional stdenv.hostPlatform.isGhcjs buildPackages.nodejs);
+      ++ (lib.optional stdenv.hostPlatform.isGhcjs buildPackages.nodejs)
+      ++ (lib.optional (ghc.useLdLld or false) llvmPackages.bintools);
 
     outputs = ["out"]
       ++ (lib.optional keepConfigFiles "configFiles")
@@ -448,6 +448,10 @@ let
       (lib.optionalString stdenv.hostPlatform.isGhcjs ''
       export HOME=$(mktemp -d)
       export EM_CACHE=$(mktemp -d)
+      if [ -d ${pkgsBuildBuild.emscripten}/share/emscripten/cache ]; then
+        cp -r ${pkgsBuildBuild.emscripten}/share/emscripten/cache/* $EM_CACHE/
+        chmod +w -R $EM_CACHE
+      fi
       '') +
       (lib.optionalString (!canCleanSource) ''
       echo "Cleaning component source not supported, leaving it un-cleaned"
@@ -595,7 +599,6 @@ let
               (''
               if id=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" id --simple-output); then
                 name=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" name --simple-output)
-                echo "--dependency=''${name#z-${package.identifier.name}-z-}=$id" >> $out/exactDep/configure-flags
                 echo "package-id $id" >> $out/envDep
                 ''
                 # Allow `package-name:sublib-name` to work in `build-depends`

builder/default.nix

@@ -75,7 +75,7 @@ let
 
   # Same as haskellPackages.shellFor in nixpkgs.
   shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {
-    inherit hsPkgs ghcForComponent makeConfigFiles hoogleLocal haskellLib pkgsBuildBuild evalPackages compiler;
+    inherit hsPkgs ghcForComponent makeConfigFiles hoogleLocal haskellLib pkgsBuildBuild evalPackages compiler ghc;
     inherit (buildPackages) glibcLocales;
   };
 

builder/ghc-for-component-wrapper.nix

@@ -37,11 +37,11 @@ let
     ${lndir}/bin/lndir -silent $unwrappedGhc $wrappedGhc
     rm -rf ${libDir}/*/
   ''
-  # ... but retain the lib/ghc/bin directory. This contains `unlit' and friends.
+  # ... but retain the lib/ghc/bin directory. This may contain `unlit' and friends.
   + ''
     if [ -d $unwrappedGhc/lib/${ghcCommand}-${ghc.version}/bin ]; then
       ln -s $unwrappedGhc/lib/${ghcCommand}-${ghc.version}/bin ${libDir}
-    else
+    elif [ -d $unwrappedGhc/lib/bin ]; then
       ln -s $unwrappedGhc/lib/bin ${libDir}
     fi
   ''

builder/haddock-builder.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, lib, haskellLib, ghc, ghcForComponent, nonReinstallablePkgs, runCommand, writeText, writeScript, makeConfigFiles }:
+{ stdenv, buildPackages, lib, haskellLib, ghc, ghcForComponent, nonReinstallablePkgs, runCommand, writeText, writeScript, makeConfigFiles, llvmPackages }:
 
 { componentId
 , component
@@ -80,7 +80,8 @@ let
 
     nativeBuildInputs =
       [ ghc buildPackages.removeReferencesTo ]
-      ++ componentDrv.executableToolDepends;
+      ++ componentDrv.executableToolDepends
+      ++ (lib.optional (ghc.useLdLld or false) llvmPackages.bintools);
 
     configurePhase = ''
       mkdir -p $configFiles
@@ -109,6 +110,12 @@ let
 
       # If we don't have any source files, no need to run haddock
       [[ -n $(find . -name "*.hs" -o -name "*.lhs") ]] && {
+      # Run any preprocessor in the custom build step
+      $SETUP_HS build \
+        "--with-ghc=false" \
+        ${lib.optionalString (haskellLib.isTest componentId) "--tests"} \
+        ${lib.concatStringsSep " " setupHaddockFlags} || true
+
       $SETUP_HS haddock \
         "--html" \
         ${lib.optionalString (haskellLib.isTest componentId) "--tests"} \
@@ -151,8 +158,12 @@ let
           ${ghc.targetPrefix}ghc-pkg -v0 --package-db $configFiles/${configFiles.packageCfgDir} -f $out/package.conf.d register "$pkg"
         done
 
-        ln -s ${componentDrv}/exactDep $out/exactDep
-        ln -s ${componentDrv}/envDep $out/envDep
+        if [ -d ${componentDrv}/exactDep ]; then
+          ln -s ${componentDrv}/exactDep $out/exactDep
+        fi
+        if [ -f ${componentDrv}/envDep ]; then
+          ln -s ${componentDrv}/envDep $out/envDep
+        fi
       '';
   }
   // haskellLib.optionalHooks {

builder/setup-builder.nix

@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, buildPackages, haskellLib, ghc, nonReinstallablePkgs, hsPkgs, makeSetupConfigFiles }@defaults:
+{ pkgs, stdenv, lib, buildPackages, haskellLib, ghc, nonReinstallablePkgs, hsPkgs, makeSetupConfigFiles, llvmPackages }@defaults:
 
 let self =
 { component, package, name, src, enableDWARF ? false, flags ? {}, revision ? null, patches ? [], defaultSetupSrc
@@ -67,7 +67,7 @@ let
         ++ builtins.concatLists component.pkgconfig
         ++ configFiles.libDeps
         ++ [ghc]; # Needs to be a build input so that the boot libraries are included
-      nativeBuildInputs = [ghc] ++ executableToolDepends;
+      nativeBuildInputs = [ghc] ++ executableToolDepends ++ (lib.optional (ghc.useLdLld or false) llvmPackages.bintools);
 
       passthru = {
         inherit (package) identifier;

builder/shell-for.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, mkShell, glibcLocales, ghcForComponent, makeConfigFiles, hsPkgs, hoogleLocal, haskellLib, pkgsBuildBuild, evalPackages, compiler }:
+{ lib, stdenv, mkShell, glibcLocales, ghcForComponent, makeConfigFiles, hsPkgs, hoogleLocal, haskellLib, pkgsBuildBuild, evalPackages, compiler, haskell-nix, ghc }:
 
 { # `packages` function selects packages that will be worked on in the shell itself.
   # These packages will not be built by `shellFor`, but their
@@ -93,6 +93,11 @@ let
     (removeSelectedInputs (haskellLib.uniqueWithName (lib.concatMap (cfg: cfg.depends) selectedConfigs))
       ++ additionalPackages);
 
+  # For non haskell dependencies (and `pre-existing` haskell packages)
+  # we want to search all the configs.
+  allConfigs = selectedConfigs ++
+    builtins.map (x: (haskellLib.dependToLib x).config) additionalPackages;
+
   # Add the system libraries and build tools of the selected haskell packages to the shell.
   # We need to remove any inputs which are selected components (see above).
   # `buildInputs`, `propagatedBuildInputs`, and `executableToolDepends` contain component
@@ -115,10 +120,13 @@ let
   # Set up a "dummy" component to use with ghcForComponent.
   component = {
     depends = packageInputs;
-    pre-existing = lib.concatMap (x: (haskellLib.dependToLib x).config.pre-existing or []) packageInputs;
-    libs         = lib.concatMap (x: (haskellLib.dependToLib x).config.libs or []) packageInputs;
-    pkgconfig    = lib.concatMap (x: (haskellLib.dependToLib x).config.pkgconfig or []) packageInputs;
-    frameworks   = lib.concatMap (x: (haskellLib.dependToLib x).config.frameworks or []) packageInputs;
+    pre-existing =
+      if exactDeps
+        then lib.unique (lib.concatMap (x: (haskellLib.dependToLib x).pre-existing or []) allConfigs)
+        else haskell-nix.ghc-pre-existing ghc;
+    libs         = haskellLib.uniqueWithName (lib.concatMap (x: (haskellLib.dependToLib x).libs or []) allConfigs);
+    pkgconfig    = haskellLib.uniqueWithName (lib.concatMap (x: (haskellLib.dependToLib x).pkgconfig or []) allConfigs);
+    frameworks   = haskellLib.uniqueWithName (lib.concatMap (x: (haskellLib.dependToLib x).frameworks or []) allConfigs);
     doExactConfig = false;
   };
   configFiles = makeConfigFiles {