Merge remote-tracking branch 'upstream/master' into circuithub

Author: TeofilC

.github/workflows/pipeline.yml

@@ -1,4 +1,4 @@
-name: "Run tests with ghc966"
+name: "Run tests with ghc967"
 
 on:
   pull_request:
@@ -22,120 +22,120 @@ jobs:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Running the nix-build tests..."
-        run: "./test/tests.sh ghc966 nix-build"
+      - name: "Run tests with ghc967: Running the nix-build tests..."
+        run: "./test/tests.sh ghc967 nix-build"
 
   unit-tests:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Running the unit tests..."
-        run: "./test/tests.sh ghc966 unit-tests"
+      - name: "Run tests with ghc967: Running the unit tests..."
+        run: "./test/tests.sh ghc967 unit-tests"
 
   runghc:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking that a nix-shell works for runghc..."
-        run: "./test/tests.sh ghc966 runghc"
+      - name: "Run tests with ghc967: Checking that a nix-shell works for runghc..."
+        run: "./test/tests.sh ghc967 runghc"
 
   cabal:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking that a nix-shell works for cabal..."
-        run: "./test/tests.sh ghc966 cabal"
+      - name: "Run tests with ghc967: Checking that a nix-shell works for cabal..."
+        run: "./test/tests.sh ghc967 cabal"
 
   cabal-doExactConfig:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking that a nix-shell works for cabal (doExactConfig component)..."
-        run: "./test/tests.sh ghc966 cabal-doExactConfig"
+      - name: "Run tests with ghc967: Checking that a nix-shell works for cabal (doExactConfig component)..."
+        run: "./test/tests.sh ghc967 cabal-doExactConfig"
 
   tests-benchmarks:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking that a nix-shell works for a project with test-suite build-tools and benchmarks..."
-        run: "./test/tests.sh ghc966 tests-benchmarks"
+      - name: "Run tests with ghc967: Checking that a nix-shell works for a project with test-suite build-tools and benchmarks..."
+        run: "./test/tests.sh ghc967 tests-benchmarks"
 
   multi-target:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking that a nix-shell works for a multi-target project..."
-        run: "./test/tests.sh ghc966 multi-target"
+      - name: "Run tests with ghc967: Checking that a nix-shell works for a multi-target project..."
+        run: "./test/tests.sh ghc967 multi-target"
 
   shellFor-single-package:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking shellFor works for a cabal project, multiple packages..."
-        run: "./test/tests.sh ghc966 shellFor-single-package"
+      - name: "Run tests with ghc967: Checking shellFor works for a cabal project, multiple packages..."
+        run: "./test/tests.sh ghc967 shellFor-single-package"
 
   shellFor-multiple-package:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking shellFor works for a cabal project, single package...y"
-        run: "./test/tests.sh ghc966 shellFor-multiple-package"
+      - name: "Run tests with ghc967: Checking shellFor works for a cabal project, single package...y"
+        run: "./test/tests.sh ghc967 shellFor-multiple-package"
 
   shellFor-hoogle:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking shellFor works for a cabal project, single package..."
-        run: "./test/tests.sh ghc966 shellFor-hoogle"
+      - name: "Run tests with ghc967: Checking shellFor works for a cabal project, single package..."
+        run: "./test/tests.sh ghc967 shellFor-hoogle"
 
   shellFor-not-depends:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking shellFor does not depend on given packages...y"
-        run: "./test/tests.sh ghc966 shellFor-not-depends"
+      - name: "Run tests with ghc967: Checking shellFor does not depend on given packages...y"
+        run: "./test/tests.sh ghc967 shellFor-not-depends"
 
   maintainer-scripts:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking the maintainer scripts...y"
-        run: "./test/tests.sh ghc966 maintainer-scripts"
+      - name: "Run tests with ghc967: Checking the maintainer scripts...y"
+        run: "./test/tests.sh ghc967 maintainer-scripts"
 
   plan-extra-hackages:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking that plan construction works with extra Hackages..."
-        run: "./test/tests.sh ghc966 plan-extra-hackages"
+      - name: "Run tests with ghc967: Checking that plan construction works with extra Hackages..."
+        run: "./test/tests.sh ghc967 plan-extra-hackages"
 
   build-extra-hackages:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: Checking that package with extra Hackages can be build..."
-        run: "./test/tests.sh ghc966 build-extra-hackages"
+      - name: "Run tests with ghc967: Checking that package with extra Hackages can be build..."
+        run: "./test/tests.sh ghc967 build-extra-hackages"
 
   hix:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Run tests with ghc966: End-2-end test of hix project initialization and flakes development shell ..."
-        run: "./test/tests.sh ghc966 hix"
+      - name: "Run tests with ghc967: End-2-end test of hix project initialization and flakes development shell ..."
+        run: "./test/tests.sh ghc967 hix"
 
 #  template:
 #    runs-on: [self-hosted, linux]
 #    steps:
 #      - uses: actions/checkout@v4
-#      - name: "Run tests with ghc966: End-2-end test of hix project initialization and flakes development shell ..."
-#        run: "./test/tests.sh ghc966 template"
+#      - name: "Run tests with ghc967: End-2-end test of hix project initialization and flakes development shell ..."
+#        run: "./test/tests.sh ghc967 template"
 
   docs:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
       - name: "Test examples in documentation ..."
-        run: "./test/tests.sh ghc966 docs"
+        run: "./test/tests.sh ghc967 docs"
 
   hydra-ifdLevel-0-and-1:
     runs-on: [self-hosted, linux]
@@ -178,9 +178,9 @@ jobs:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Check closure size with ghc966"
+      - name: "Check closure size with ghc967"
         run: |
-          nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc966 -o check-closure-size.sh
+          nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc967 -o check-closure-size.sh
           echo "+++ Closure size (MB)"
           ./check-closure-size.sh
 
@@ -208,7 +208,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: "Make sure non store paths like can be used as src"
         run: |
-          nix-build build.nix -A maintainer-scripts.check-path-support --argstr compiler-nix-name ghc966 -o check-path-support.sh
+          nix-build build.nix -A maintainer-scripts.check-path-support --argstr compiler-nix-name ghc967 -o check-path-support.sh
           ./check-path-support.sh
 
   haskell-nix-roots-do-not-require-IFDs:
@@ -218,19 +218,19 @@ jobs:
       - name: "Check that the haskell.nix roots do not require IFDs"
         run: nix build .#roots.x86_64-linux --accept-flake-config --option allow-import-from-derivation false
 
-  hydra-without-remote-builders-ghc966:
+  hydra-without-remote-builders-ghc967:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 8.10.7"
-        run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc966-native --show-trace --builders ''
+      - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.6.7"
+        run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc967-native --show-trace --builders ''
 
-  hydra-without-remote-builders-ghc9101:
+  hydra-without-remote-builders-ghc9102:
     runs-on: [self-hosted, linux]
     steps:
       - uses: actions/checkout@v4
-      - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.10.1"
-        run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9101-native --show-trace --builders ''
+      - name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.10.2"
+        run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9102-native --show-trace --builders ''
 
   hix-cabal:
     runs-on: [self-hosted, linux]

.github/workflows/updates.yml

@@ -19,6 +19,7 @@ jobs:
       - name: "Update pins"
         run: |
           nix flake update hackage
+          nix flake update hackage-for-stackage
           nix flake update stackage
       - name: Commit and push changes
         run: |

build.nix

@@ -6,11 +6,6 @@
 , nixpkgsArgs ? haskellNix.nixpkgsArgs
 , pkgs ? import nixpkgs nixpkgsArgs
 , evalPackages ? import nixpkgs nixpkgsArgs
-# This version is used to make our GitHub Action runners happy
-# Using `nixpkgs-unstable` currently results in:
-#   version `GLIBCXX_3.4.30' not found
-, nixpkgsForGitHubAction ? haskellNix.sources.nixpkgs-2211
-, pkgsForGitHubAction ? import nixpkgsForGitHubAction (nixpkgsArgs // { inherit (pkgs) system; })
 , ifdLevel ? 1000
 , compiler-nix-name ? throw "No `compiler-nix-name` passed to build.nix"
 , haskellNix ? (import ./default.nix {})
@@ -62,10 +57,10 @@ in rec {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.2";
       };
-    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.8.3" || ghcFromTo "9.10" "9.11") {
-      "hls-29" = tool compiler-nix-name "haskell-language-server" {
+    } // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.10.2") {
+      "hls" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
-        src = pkgs.haskell-nix.sources."hls-2.9";
+        src = pkgs.haskell-nix.sources."hls-2.10";
       };
     })
   );
@@ -98,7 +93,7 @@ in rec {
       nix-tools = haskell.nix-tools-unchecked; # includes cabal-install and default-setup
     };
     check-materialization-concurrency = pkgs.buildPackages.callPackage ./scripts/check-materialization-concurrency/check.nix {};
-    check-path-support = pkgsForGitHubAction.buildPackages.callPackage ./scripts/check-path-support.nix {
+    check-path-support = pkgs.buildPackages.callPackage ./scripts/check-path-support.nix {
       inherit compiler-nix-name;
     };
   };

builder/comp-builder.nix

@@ -210,7 +210,15 @@ let
       (enableFeature enableShared "shared")
       (enableFeature enableExecutableDynamic "executable-dynamic")
       (enableFeature doCoverage "coverage")
-      (enableFeature (enableLibraryForGhci && !stdenv.hostPlatform.isGhcjs) "library-for-ghci")
+      # For Android (or really anything that uses lld), -r will silently drop
+      # "lazy" symbols. Those are leaf symbols with no referenes. This however
+      # does not work when loading the objects into the linker, because then we
+      # occationally miss symbols when subsequent libraries depending on the one
+      # that dropped the symbol are loaded.  bfd and lld support --whole-archive
+      # lld -r --whole-archive ... will _not_ drop lazy symbols. However the
+      # --whole-archive flag needs to come _before_ the objects, it's applied in
+      # sequence. The proper fix is thusly to add --while-archive to Cabal.
+      (enableFeature (enableLibraryForGhci && !stdenv.hostPlatform.isGhcjs && !stdenv.hostPlatform.isAndroid) "library-for-ghci")
     ] ++ lib.optionals (stdenv.hostPlatform.isMusl && (haskellLib.isExecutableType componentId)) [
       # These flags will make sure the resulting executable is statically linked.
       # If it uses other libraries it may be necessary for to add more
@@ -378,8 +386,8 @@ let
         inherit (package.identifier) version;
         nativeBuildInputs = [shellWrappers.drv] ++ attrs.nativeBuildInputs;
       });
-      profiled = self (drvArgs // { enableLibraryProfiling = true; });
-      dwarf = self (drvArgs // { enableDWARF = true; });
+      profiled = lib.makeOverridable self (drvArgs // { enableLibraryProfiling = true; });
+      dwarf = lib.makeOverridable self (drvArgs // { enableDWARF = true; });
     } // lib.optionalAttrs (haskellLib.isLibrary componentId || haskellLib.isTest componentId) ({
         inherit haddock;
         inherit (haddock) haddockDir; # This is null if `doHaddock = false`

builder/default.nix

@@ -64,7 +64,7 @@ let
     let
       haskellPackages = {
         # For musl we can use haddock from the buildGHC
-        ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl
+        ghc = if stdenv.targetPlatform.isMusl
           then ghc.buildGHC
           else ghc;
         inherit packages hoogle;

builder/ghc-for-component-wrapper.nix

@@ -23,7 +23,7 @@ let
   libDir         = "$wrappedGhc/${configFiles.libDir}";
   docDir         = "$wrappedGhc/share/doc/ghc/html";
   # For musl we can use haddock from the buildGHC
-  haddock        = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl
+  haddock        = if stdenv.targetPlatform.isMusl
     then ghc.buildGHC
     else ghc;
 
@@ -125,7 +125,7 @@ let
     done
 
   ''
-  + lib.optionalString (stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl && builtins.compareVersions ghc.version "9.9" >0) ''
+  + lib.optionalString (haskellLib.isNativeMusl && builtins.compareVersions ghc.version "9.9" >0) ''
      ln -s $wrappedGhc/bin/${targetPrefix}unlit $wrappedGhc/bin/unlit
      ln -s $wrappedGhc/bin/${ghcCommand}-iserv $wrappedGhc/bin/ghc-iserv
      ln -s $wrappedGhc/bin/${ghcCommand}-iserv-prof $wrappedGhc/bin/ghc-iserv-prof