Update nixpkgs and ghc pins (input-output-hk#2067)

* Update nixpkgs and ghc pins * Update nixpkgs and ghc pins * ifdLevel 1 * Fixes for new nixpkgs and ghc * ifdLevel 2 * ifdLevel 3 * Include parsec from ghc 9.8 source * Disable fortify for musl build of text package * Wind back ghc 9.8 git commit for now * ifdLevel 1 * ifdLevel 2 * ifdLevel 3
S-NA · Sep 26, 2023 · 79d96fc · 79d96fc
1 parent 8e42ccd
commit 79d96fc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/lib/ghcjs-project.nix b/lib/ghcjs-project.nix
@@ -86,7 +86,7 @@ let
             makeWrapper
             xorg.lndir
             gmp
-            pkgconfig
+            (pkgs.buildPackages.pkg-config or pkgconfig)
         ]
         ++ [ ghc cabal-install emsdk ];
     # Configured the GHCJS source

diff --git a/modules/configuration-nix.nix b/modules/configuration-nix.nix
@@ -184,4 +184,10 @@ in {
   # Using -j1 works around the issue.
   packages.gi-gtk.components.library.ghcOptions =
     pkgs.lib.optional (__elem config.compiler.nix-name ["ghc961" "ghc962"]) "-j1";
+
+  # With recent versions of nixpkgs fortify causes musl version of the
+  # text package to fail with:
+  #   error: inlining failed in call to ‘always_inline’ ‘void* memcpy(void*, const void*, size_t)’: target specific option mismatch
+  packages.text.components.library.hardeningDisable =
+    pkgs.lib.optionals pkgs.stdenv.hostPlatform.isMusl ["fortify"];
 }
diff --git a/overlays/fetch-source.nix b/overlays/fetch-source.nix
@@ -32,7 +32,7 @@ in {
         inherit name;
         value = final.fetchFromGitLab {
                     domain = "gitlab.haskell.org";
-                    owner = "hamishmack";
+                    owner = "ghc";
                     repo = "ghc";
                     fetchSubmodules = true;
                     inherit (lockFile.nodes.${name}.locked) rev;

diff --git a/overlays/ghc-packages.nix b/overlays/ghc-packages.nix
@@ -103,6 +103,8 @@ let
     } // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.2.1" >= 0) {
       deepseq      = "libraries/deepseq";
       pretty       = "libraries/pretty";
+    } // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.8" >= 0) {
+      parsec       = "libraries/parsec";
     } // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.9" >= 0) {
       ghc-platform = "libraries/ghc-platform";
       ghc-internal = "libraries/ghc-internal";

diff --git a/overlays/haskell.nix b/overlays/haskell.nix
@@ -1085,7 +1085,7 @@ final: prev: {
                 }
                 else {
                   cabalProjectLocal = ''
-                    allow-newer: *:base
+                    allow-newer: *:base, *:bytestring
                   '';
                 }))).hsPkgs.iserv-proxy.components.exes;
             in {