From 116021c98a2ade19b1f48b205e83acdeae836d0c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 4 Jun 2020 18:18:03 +0200 Subject: [PATCH] haskellPackages.c2hsc: apply patchto find gcc ...used in tests. Fix is upstream but there has been no sign of release for the past 6 months, fixes https://github.com/NixOS/nixpkgs/issues/63764. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d23d504d110..84f33911f31 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,6 +26,12 @@ self: super: { # successfully with recent versions of the compiler). bin-package-db = null; + # waiting for release: https://github.com/jwiegley/c2hsc/issues/41 + c2hsc = appendPatch super.c2hsc (pkgs.fetchpatch { + url = "https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch"; + sha256 = "1c7knpvxr7p8c159jkyk6w29653z5yzgjjqj11130bbb8mk9qhq7"; + }); + # Some Hackage packages reference this attribute, which exists only in the # GHCJS package set. We provide a dummy version here to fix potential # evaluation errors. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3acdf164e6f..50b47ab3051 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3562,7 +3562,6 @@ broken-packages: - c0parser - c10k - c2ats - - c2hsc - cabal-audit - cabal-bounds - cabal-bundle-clib