From 7edc323045c293ae5e8c22db42bc17771724e8e8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:03:41 +0200 Subject: [PATCH] haskell.compiler.ghc946: remove left-over patch This was specific to GHC 9.4.6 and should have been dropped in 95c179f9fbe0178a6d96cf0c1e3e06566d90aa29 as well. --- .../ghc/9.4.6-bytestring-posix-source.patch | 15 --------------- .../compilers/ghc/common-make-native-bignum.nix | 6 ------ 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch diff --git a/pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch b/pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch deleted file mode 100644 index 644ab295191f..000000000000 --- a/pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch +++ /dev/null @@ -1,15 +0,0 @@ -Make sure that the appropriate feature flags are set when -Rts.h is included, so that clockid_t is defined. - -diff --git a/cbits/is-valid-utf8.c b/cbits/is-valid-utf8.c -index 01b3b41..c69596a 100644 ---- a/libraries/bytestring/cbits/is-valid-utf8.c -+++ b/libraries/bytestring/cbits/is-valid-utf8.c -@@ -29,6 +29,7 @@ SUCH DAMAGE. - */ - #pragma GCC push_options - #pragma GCC optimize("-O2") -+#include "rts/PosixSource.h" - #include - #include - #include diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 9b9d386ecdb1..b9d0b58832d3 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -410,12 +410,6 @@ stdenv.mkDerivation ( }) ] - ++ lib.optionals (version == "9.4.6") [ - # Work around a type not being defined when including Rts.h in bytestring's cbits - # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. - ./9.4.6-bytestring-posix-source.patch - ] - ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs.