diff options
author | Peter Simons <simons@cryp.to> | 2017-11-10 19:26:24 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-11-11 17:38:42 +0100 |
commit | c6d9b5d96aa14855e200f5030c22a17a74559c02 (patch) | |
tree | 16642664a6b9404da28173cf5b19437c7ebbafad | |
parent | 56a4c3750ed763d1ab55a341de40c7f20b197cb8 (diff) | |
download | nixlib-c6d9b5d96aa14855e200f5030c22a17a74559c02.tar nixlib-c6d9b5d96aa14855e200f5030c22a17a74559c02.tar.gz nixlib-c6d9b5d96aa14855e200f5030c22a17a74559c02.tar.bz2 nixlib-c6d9b5d96aa14855e200f5030c22a17a74559c02.tar.lz nixlib-c6d9b5d96aa14855e200f5030c22a17a74559c02.tar.xz nixlib-c6d9b5d96aa14855e200f5030c22a17a74559c02.tar.zst nixlib-c6d9b5d96aa14855e200f5030c22a17a74559c02.zip |
haskell-c2hs: use development version from github to work around _Float128 bug
Works around https://github.com/haskell/c2hs/issues/192. Closes https://github.com/NixOS/nixpkgs/issues/31411. Closes https://github.com/NixOS/nixpkgs/pull/31498.
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 27bf4012a784..5203a7c7618d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -65,9 +65,6 @@ self: super: { options = dontCheck super.options; statistics = dontCheck super.statistics; - # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 - c2hs = dontCheck super.c2hs; - # https://github.com/gilith/hol/pull/1 hol = appendPatch (doJailbreak super.hol) (pkgs.fetchpatch { name = "hol.patch"; @@ -978,4 +975,17 @@ self: super: { # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 stack2nix = doJailbreak super.stack2nix; + + # Hacks to work around https://github.com/haskell/c2hs/issues/192. + c2hs = (overrideCabal super.c2hs { + version = "0.26.2-28-g8b79823"; + doCheck = false; + src = pkgs.fetchFromGitHub { + owner = "deech"; + repo = "c2hs"; + rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; + sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; + }; + }).override { language-c = self.language-c_0_7_0; }; + } |