diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-17 00:12:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 00:12:37 +0000 |
| commit | f80081652f7e87934ba37c0a80c8a378f4ac233d (patch) | |
| tree | 43d8aa6815a64424e0dbeee9e9e20bd7fe223bff /pkgs/development/haskell-modules | |
| parent | 13a5e59195f556bd723578be22a3fd01d6766e0a (diff) | |
| parent | d4f9180ac2703bf178be0ee4c667c4eeb28ee891 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 88ea6f3f5f79..803e34163f9d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -249,7 +249,9 @@ self: super: { # Fix ghc-9.6.x build errors. libmpd = appendPatch - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + # https://github.com/vimus/libmpd-haskell/pull/138 + (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; + name = "vimus-libmpd-haskell-pull-138.patch"; sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; }) super.libmpd; @@ -259,8 +261,9 @@ self: super: { editedCabalFile = null; buildDepends = drv.buildDepends or [] ++ [ self.HUnit ]; patches = [(pkgs.fetchpatch { + # https://github.com/jgoerzen/configfile/pull/12 name = "ConfigFile-pr-12.patch"; - url = "https://github.com/jgoerzen/configfile/pull/12.patch"; + url = "https://github.com/jgoerzen/configfile/compare/d0a2e654be0b73eadbf2a50661d00574ad7b6f87...83ee30b43f74d2b6781269072cf5ed0f0e00012f.patch"; sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ="; })]; }) super.ConfigFile; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7001e4220bae..0b8af6ba6de4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -811,5 +811,18 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? dontStrip) { inherit dontStrip; } // optionalAttrs (postPhases != []) { inherit postPhases; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } + +# Implicit pointer to integer conversions are errors by default since clang 15. +# Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. +// lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; +} + +# Ensure libc++abi is linked even when clang is invoked as just `clang` or `cc`. +# Works around https://github.com/NixOS/nixpkgs/issues/166205. +# This can be dropped once a fix has been committed to cc-wrapper. +// lib.optionalAttrs (stdenv.cc.isClang && stdenv.cc.libcxx != null) { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; +} ) ) |