Unbreak busted linking. (#2128)

* Unbreak busted linking.
   We need to pass c++abi as well as c++, however double-conversion does not specify those.
* Fix unstable to the last building rev
* Restrict the allow-newer to shipped only packages.
* Only selectively allow newer in tests
* Bump head.hackage hash (apparenlty some packages changed :-/)
* hls-2.4.0.1 does _not_ build with ghc 9.8
* HLS cabal test does not work on 9.8

Author: angerman

build.nix

@@ -68,28 +68,11 @@ in rec {
       };
     } // pkgs.lib.optionalAttrs (
       __compareVersions haskell.compiler.${compiler-nix-name}.version "9.0" >= 0 &&
-      __compareVersions haskell.compiler.${compiler-nix-name}.version "9.9" < 0
+      __compareVersions haskell.compiler.${compiler-nix-name}.version "9.8" < 0
     ) {
       "hls-24" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-2.4";
-        # Even though this is in the cabal.project it is inside a condional
-        # and so haskell.nix cannot parse it properly.  Luckily adding it
-        # again seems to work fine.
-        cabalProjectLocal = ''
-          repository head.hackage.ghc.haskell.org
-            url: https://ghc.gitlab.haskell.org/head.hackage/
-            secure: True
-            key-threshold: 3
-            root-keys:
-               f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-               26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-               7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-            --sha256: sha256-aVI93DtHziicNn2mGli0YE+bC5BeT7mOQQETp2Thi68=
-
-          if impl(ghc < 9.7)
-            active-repositories: hackage.haskell.org
-        '';
       };
     })
   );

flake.lock

@@ -10,7 +10,10 @@
     nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; };
     nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
     nixpkgs-2311 = { url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin"; };
-    nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
+    # The libsodium bump in 85c6e70b555fe892a049fa3d9dce000dc23a9562 breaks th-dll tests.
+    # And later it breaks in th-dll due to some change in the windows libs. We should probably
+    # drop unsable.
+    nixpkgs-unstable = { url = "github:NixOS/nixpkgs?rev=47585496bcb13fb72e4a90daeea2f434e2501998"; }; # nixpkgs-unstable };
     ghc98X = {
       flake = false;
       url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.8&submodules=1";
@@ -24,7 +27,7 @@
     "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.1"; flake = false; };
     "hls-2.2" = { url = "github:haskell/haskell-language-server/2.2.0.0"; flake = false; };
     "hls-2.3" = { url = "github:haskell/haskell-language-server/2.3.0.0"; flake = false; };
-    "hls-2.4" = { url = "github:haskell/haskell-language-server/2.4.0.0"; flake = false; };
+    "hls-2.4" = { url = "github:haskell/haskell-language-server/2.4.0.1"; flake = false; };
     hydra.url = "hydra";
     hackage = {
       url = "github:input-output-hk/hackage.nix";

flake.nix

@@ -1272,7 +1272,11 @@ in {
         # version of nix-tools (on platforms where we cannot use the
         # static nix-tools).
         cabalProjectLocal = ''
-          allow-newer: *:*
+          -- allow newer packages, that are bound to be newer due to
+          -- being shipped with a newer compiler.  If you extend this
+          -- be very careful to only extend it for absolutely necessary packages
+          -- otherwise we risk running into broken build-plans down the line.
+          allow-newer: *:base, *:template-haskell, *:bytestring, *:text
 
           repository head.hackage.ghc.haskell.org
             url: https://ghc.gitlab.haskell.org/head.hackage/
@@ -1282,7 +1286,7 @@ in {
                f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
                26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
                7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-            --sha256: sha256-aVI93DtHziicNn2mGli0YE+bC5BeT7mOQQETp2Thi68=
+            --sha256: sha256-Bkn2Etb0JVmb7tM7jxuIoYLFnSp7acqraEYVq0I5oUM=
 
           active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
         '';

overlays/bootstrap.nix

@@ -14,6 +14,13 @@ _final: prev:
               # https://github.com/NixOS/nixpkgs/pull/47676
               # https://github.com/NixOS/nixpkgs/issues/45042
               x509-system.components.library.preBuild = "substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security";
+            } // pkgs.lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin)
+            {
+              # fix broken c++ library selection for GHC < 9.4
+              # for GHC >= 9.4 the system-cxx-std-lib pseudo-package does this.
+              double-conversion.components.library.preConfigure = ''
+                substituteInPlace double-conversion.cabal --replace 'extra-libraries: c++' 'extra-libraries: c++ c++abi'
+              '';
             };
         })
     ];

overlays/darwin.nix

@@ -1,5 +1,9 @@
 if impl(ghc>=9.8)
-  allow-newer: *:*
+  -- allow newer packages, that are bound to be newer due to
+  -- being shipped with a newer compiler.  If you extend this
+  -- be very careful to only extend it for absolutely necessary packages
+  -- otherwise we risk running into broken build-plans down the line.
+  allow-newer: *:base, *:template-haskell, *:bytestring, *:text, *:ghc-prim, *:deepseq
 
 repository head.hackage.ghc.haskell.org
   url: https://ghc.gitlab.haskell.org/head.hackage/
@@ -9,7 +13,7 @@ repository head.hackage.ghc.haskell.org
      f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
      26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
      7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-  --sha256: sha256-aVI93DtHziicNn2mGli0YE+bC5BeT7mOQQETp2Thi68=
+  --sha256: sha256-Bkn2Etb0JVmb7tM7jxuIoYLFnSp7acqraEYVq0I5oUM=
 
 repository ghcjs-overlay
   url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/91f4ce9bea0e7f739b7495647c3f72a308ed1c6f

test/cabal.project.local

@@ -16,7 +16,7 @@ let
            f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
            26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
            7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-        --sha256: sha256-aVI93DtHziicNn2mGli0YE+bC5BeT7mOQQETp2Thi68=
+        --sha256: sha256-Bkn2Etb0JVmb7tM7jxuIoYLFnSp7acqraEYVq0I5oUM=
 
       if impl(ghc < 9.7)
         active-repositories: hackage.haskell.org
@@ -33,5 +33,5 @@ in recurseIntoAttrs {
   meta.disabled =
     stdenv.hostPlatform != stdenv.buildPlatform
     || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0.1" < 0
-    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.9.0" >= 0;
+    || __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.0" >= 0;
 }