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

Author: hamishmack

.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

builder/comp-builder.nix

@@ -594,7 +594,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

@@ -79,7 +79,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/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 {

changelog.md

@@ -1,11 +1,11 @@
 This file contains a summary of changes to Haskell.nix and `nix-tools`
 that will impact users.
 
-## Jan 29, 2024
+## Jan 29, 2025
 
 Removed GHC <9.6 from CI.
 
-The latest `nixpkgs-unstable` cause problems with
+The latest `nixpkgs-unstable` caused problems with
   * GHC 8.10.7
   * GHC 9.6.6 mingwW64 (ucrt64 works still as does mingwW64
     with newer GHC versions)

flake.lock

@@ -86,11 +86,11 @@ let
         HIX_FLAKE="$(mktemp -d)/flake.nix"
         sed 's|EVAL_SYSTEM|${pkgs.stdenv.hostPlatform.system}|' < ${hixProject}/flake.nix > $HIX_FLAKE
         if ! cmp $HIX_FLAKE $FLAKE/flake.nix &>/dev/null; then
-            if [ -e $FLAKE/flake.lock ]; then
-            echo "Updating $FLAKE/flake.nix and deleting old $FLAKE/flake.lock"
+          if [ -e $FLAKE/flake.lock ]; then
+            >&2 echo "Updating $FLAKE/flake.nix and deleting old $FLAKE/flake.lock"
             rm $FLAKE/flake.lock
           else
-            echo "Updating $FLAKE/flake.nix"
+            >&2 echo "Updating $FLAKE/flake.nix"
           fi
           cp $HIX_FLAKE $FLAKE/flake.nix
           chmod +w $FLAKE/flake.nix

hix/default.nix

@@ -370,57 +370,6 @@ let
     '';
   };
 
-  ghc-pkgs = [
-    "Cabal"
-    "array"
-    "base"
-    "binary"
-    "bytestring"
-    "containers"
-    "deepseq"
-    "directory"
-    "filepath"
-    "ghc-boot"
-    "ghc-boot-th"
-    "ghc-compact"
-    "ghc-heap"
-    "ghc-prim"
-    "ghci"
-    "integer-gmp"
-    "mtl"
-    "parsec"
-    "pretty"
-    "process"
-    "rts"
-    "template-haskell"
-    "text"
-    "time"
-    "transformers"
-  ] ++ pkgs.lib.optionals (!pkgs.stdenv.targetPlatform.isGhcjs || builtins.compareVersions ghc.version "9.0" > 0) [
-    # GHCJS 8.10 does not have these
-    "Cabal-syntax"
-    "exceptions"
-    "file-io"
-    "ghc"
-    "ghc-bignum"
-    "ghc-experimental"
-    "ghc-internal"
-    "ghc-platform"
-    "ghc-toolchain"
-    "haskeline"
-    "hpc"
-    "libiserv"
-    "os-string"
-    "semaphore-compat"
-    "stm"
-    "xhtml"
-  ] ++ pkgs.lib.optionals (!pkgs.stdenv.targetPlatform.isGhcjs) [
-    "terminfo"
-  ] ++ (if pkgs.stdenv.targetPlatform.isWindows
-    then [ "Win32" ]
-    else [ "unix" ]
-  );
-
   dummy-ghc-pkg-dump = evalPackages.runCommand "dummy-ghc-pkg-dump" {
       nativeBuildInputs = [
         evalPackages.haskell-nix.nix-tools-unchecked.exes.cabal2json
@@ -561,7 +510,7 @@ let
                 PKGS+=" ${name}"
                 LAST_PKG="${name}"
               fi
-            '') ghc-pkgs)
+            '') (pkgs.haskell-nix.ghc-pre-existing ghc))
           }
           ${ # There is no .cabal file for system-cxx-std-lib
             pkgs.lib.optionalString (builtins.compareVersions ghc.version "9.2" >= 0) (