Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub

Author: ocharles

builder/make-config-files.nix

@@ -160,7 +160,7 @@ let
         fi
       ''}
     done
-    for p in ${lib.concatStringsSep " " (lib.remove "ghc" nonReinstallablePkgs')}; do
+    for p in ${lib.concatStringsSep " " nonReinstallablePkgs'}; do
       if [ -e $ghcDeps/envDeps/$p ]; then
         cat $ghcDeps/envDeps/$p >> $configFiles/ghc-environment
       fi

changelog.md

@@ -1,6 +1,47 @@
 This file contains a summary of changes to Haskell.nix and `nix-tools`
 that will impact users.
 
+## Jun 5, 2024
+
+Haskell.nix now respects the `pre-existing` packages selected
+by the cabal planner.  The selection made by the planner
+is used to set `nonReinstallablePkgs`.
+
+Instead setting `nonReinstallablePkgs` and `reinstallableLibGhc`
+haskell.nix projects should add `constraints` to the cabal project.
+
+For instance to force the use of the `pre-exising` `text`
+package add:
+
+```
+  constraints: text installed
+```
+
+To make sure `text` is reinstalled use:
+
+```
+  constraints: text source
+```
+
+The `pre-existing` `ghc` will now be used by default as
+that is what `cabal` will choose (haskell.nix used to choose
+`reinstallableLibGhc=true` by default).
+
+To allow cabal to choose reinstalling `ghc` add:
+
+```
+  allow-boot-library-installs: True
+```
+
+To force cabal to choose reinstalling:
+
+```
+  constraints: ghc source
+  allow-boot-library-installs: True
+```
+
+It may also need `allow-newer: ghc:Cabal`
+
 ## Mar 27, 2023
 
 Haskell.nix will no longer parse the `cabal.project` file to

ci.nix

@@ -56,11 +56,7 @@
       # cabal-install and nix-tools plans.  When removing a ghc version
       # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
       # Update supported-ghc-versions.md to reflect any changes made here.
-      nixpkgs.lib.optionalAttrs (nixpkgsName == "R2305") {
-        ghc810 = false;
-        ghc90 = false;
-        ghc92 = false;
-      } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2311") {
+      nixpkgs.lib.optionalAttrs (nixpkgsName == "R2311") {
         ghc94 = false;
         ghc96 = false;
         ghc98 = false;
@@ -88,8 +84,8 @@
        || (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
        )) {
     inherit (lib.systems.examples) ghcjs;
-  } // lib.optionalAttrs (nixpkgsName != "unstable"
-      && (__match ".*llvm" compiler-nix-name == null)
+  } // lib.optionalAttrs (
+         (__match ".*llvm" compiler-nix-name == null)
       && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc884"])
        || (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) mingwW64;

compiler/ghc/default.nix

@@ -67,8 +67,15 @@ let self =
 , useLdGold ?
     # might be better check to see if cc is clang/llvm?
     # use gold as the linker on linux to improve link times
-    # do not use it on musl due to a ld.gold bug. See: <https://sourceware.org/bugzilla/show_bug.cgi?id=22266>.
-    (stdenv.targetPlatform.isLinux && !stdenv.targetPlatform.isAndroid && !stdenv.targetPlatform.isMusl)
+    # do not use ld.gold 2.3 with musl due to a ld.gold bug.
+    # See: <https://sourceware.org/bugzilla/show_bug.cgi?id=22266>.
+    # Note that this bug was resolved in 2017.
+    ( stdenv.targetPlatform.isLinux
+      # don't use gold on android.
+      && !stdenv.targetPlatform.isAndroid
+      # don't use gold with with musl. Still seems to be
+      # affected by 22266.
+      && !stdenv.targetPlatform.isMusl)
 
 , ghc-version ? src-spec.version
 , ghc-version-date ? null
@@ -246,21 +253,28 @@ let
           then "ghc928"
           else "ghc962";
     in
-    buildPackages.pinned-haskell-nix.tool compiler-nix-name "hadrian" {
+    buildPackages.haskell-nix.tool compiler-nix-name "hadrian" {
       compilerSelection = p: p.haskell.compiler;
       index-state = buildPackages.haskell-nix.internalHackageIndexState;
       # Verions of hadrian that comes with 9.6 depends on `time`
       materialized =
         if builtins.compareVersions ghc-version "9.4" < 0
           then ../../materialized/${compiler-nix-name}/hadrian-ghc92
+        else if builtins.compareVersions ghc-version "9.4.8" < 0
+          then ../../materialized/${compiler-nix-name}/hadrian-ghc947
         else if builtins.compareVersions ghc-version "9.6" < 0
           then ../../materialized/${compiler-nix-name}/hadrian-ghc94
+        else if builtins.compareVersions ghc-version "9.6.5" < 0
+          then ../../materialized/${compiler-nix-name}/hadrian-ghc964
         else if builtins.compareVersions ghc-version "9.8" < 0
           then ../../materialized/${compiler-nix-name}/hadrian-ghc96
+        else if builtins.compareVersions ghc-version "9.8.2" < 0
+          then ../../materialized/${compiler-nix-name}/hadrian-ghc981
         else if builtins.compareVersions ghc-version "9.9" < 0
           then ../../materialized/${compiler-nix-name}/hadrian-ghc98
         else ../../materialized/${compiler-nix-name}/hadrian-ghc99;
       modules = [{
+        reinstallableLibGhc = false;
         # Apply the patches in a way that does not require using something
         # like `srcOnly`. The problem with `pkgs.srcOnly` was that it had to run
         # on a platform at eval time.
@@ -314,6 +328,11 @@ let
       # `-fexternal-dynamic-refs` causes `undefined reference` errors when building GHC cross compiler for windows
       + lib.optionalString (enableRelocatedStaticLibs && targetPlatform.isx86_64 && !targetPlatform.isWindows)
         " '*.*.ghc.*.opts += -fexternal-dynamic-refs'"
+      # The fact that we need to set this here is pretty idiotic. GHC should figure this out on it's own.
+      # Either have a runtime flag/setting to disable it or if dlopen fails, remember that it failed and
+      # fall back to non-dynamic. We only have dynamic linker with musl if host and target arch match.
+      + lib.optionalString (targetPlatform.isAndroid || (targetPlatform.isMusl && haskell-nix.haskellLib.isCrossTarget))
+        " '*.ghc.cabal.configure.opts += --flags=-dynamic-system-linker'"
       # 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'"

flake.lock

@@ -99,7 +99,9 @@ let
               (compilerSelection pkgs)."${compiler-nix-name}";
 
 in let
-  ghc = ghc';
+  ghc = if ghc' ? latestVersion
+    then __trace "WARNING: ${ghc'.version} is out of date, consider using upgrading to ${ghc'.latestVersion}." ghc'
+    else ghc';
   subDir' = src.origSubDir or "";
   subDir = pkgs.lib.strings.removePrefix "/" subDir';
 
@@ -361,46 +363,49 @@ let
 
   ghc-pkgs = [
     "Cabal"
-    "Cabal-syntax"
     "array"
     "base"
     "binary"
     "bytestring"
     "containers"
     "deepseq"
     "directory"
-    "exceptions"
     "filepath"
-    "ghc"
-    "ghc-bignum"
     "ghc-boot"
     "ghc-boot-th"
     "ghc-compact"
-    "ghc-experimental"
     "ghc-heap"
-    "ghc-internal"
-    "ghc-platform"
     "ghc-prim"
-    "ghc-toolchain"
     "ghci"
-    "haskeline"
-    "hpc"
     "integer-gmp"
-    "libiserv"
     "mtl"
-    "os-string"
     "parsec"
     "pretty"
     "process"
     "rts"
-    "semaphore-compat"
-    "stm"
     "template-haskell"
-    "terminfo"
     "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"
+    "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" ]
@@ -434,7 +439,22 @@ let
                 cat $cabal_file | sed -e 's/@ProjectVersionMunged@/${ghc.version}/g' -e 's/default: *@[A-Za-z0-9]*@/default: False/g' -e 's/@Suffix@//g' > $fixed_cabal_file
                 json_cabal_file=$(mktemp)
                 cabal2json $fixed_cabal_file > $json_cabal_file
-                EXPOSED_MODULES_${varname name}="$(jq -r '.library."exposed-modules"[]|select(type=="array")[]' $json_cabal_file | tr '\n' ' ')"
+
+                exposed_modules="$(jq -r '.library."exposed-modules"[]|select(type=="array")[]' $json_cabal_file)"
+                reexported_modules="$(jq -r '.library."reexported-modules"//[]|.[]|select(type=="array")[]' $json_cabal_file)"
+
+                # FIXME This is a bandaid. Rather than doing this, conditionals should be interpreted.
+                ${pkgs.lib.optionalString pkgs.stdenv.targetPlatform.isGhcjs ''
+                exposed_modules+=" $(jq -r '.library."exposed-modules"[]|select(type=="object" and .if.arch == "javascript")|.then[]' $json_cabal_file)"
+                ''}
+                ${pkgs.lib.optionalString pkgs.stdenv.targetPlatform.isWindows ''
+                exposed_modules+=" $(jq -r '.library."exposed-modules"[]|select(type=="object" and .if.os == "windows")|.then[]' $json_cabal_file)"
+                ''}
+                ${pkgs.lib.optionalString (!pkgs.stdenv.targetPlatform.isWindows) ''
+                exposed_modules+=" $(jq -r '.library."exposed-modules"[]|select(type=="object" and .if.not.os == "windows")|.then[]' $json_cabal_file)"
+                ''}
+
+                EXPOSED_MODULES_${varname name}="$(tr '\n' ' ' <<< "$exposed_modules $reexported_modules")"
                 DEPS_${varname name}="$(jq -r '.library."build-depends"[]|select(type=="array")[],select(type=="object").then[]' $json_cabal_file | sed 's/^\([A-Za-z0-9-]*\).*$/\1/g' | sort -u | tr '\n' ' ')"
                 VER_${varname name}="$(jq -r '.version' $json_cabal_file)"
                 PKGS+=" ${name}"

lib/call-cabal-project-to-nix.nix

@@ -340,7 +340,19 @@ in {
 
   # Converts from a `compoent.depends` value to a library derivation.
   # In the case of sublibs the `depends` value should already be the derivation.
-  dependToLib = d: d.components.library or d;
+  dependToLib = d:
+    # Do simplify this to `d.components.library or d`, as that
+    # will not give a good error message if the `.library`
+    # is missing (happens if the package is unplanned,
+    # but has overrides).
+    # It would be nice to put an `assert` here, but there is
+    # currently no good way to get the name of the dependency
+    # when it is not in the plan.  The attribute path of
+    # `d` in the `nix` error should include the name
+    # eg. `packages.Cabal.components.library`.
+    if d ? components
+      then d.components.library
+      else d;
 
   projectOverlays = import ./project-overlays.nix {
     inherit lib haskellLib;

lib/default.nix

@@ -2167,7 +2167,7 @@ pkgs:
     "gdkmm-3.0" = [ "gtkmm3" ];
     "gtkmm-3.0" = [ "gtkmm3" ];
     "gtkmm-4.0" = [ "gtkmm4" ];
-    "libgtkpod-1.1.0" = [ "gtkpod" ];
+#    "libgtkpod-1.1.0" = [ "gtkpod" ];
 #    "gtksourceview-3.0" = [ "gtksourceview" ];
     "gtksourceview-3.0" = [ "gtksourceview3" ];
     "gtksourceview-4" = [ "gtksourceview4" ];