diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
| commit | fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74 (patch) | |
| tree | fc80390e190e04aeb8330522f475be313feac4b8 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 9dfb0b2db04a42815356e6eabba9fac92ccf4cc4 (diff) | |
| parent | b9565143eaa17b7b7e03612769ebc6ca24eddae0 (diff) | |
| download | nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.gz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.bz2 nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.lz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.xz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.zst nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b92ba205b843..7120d15ade7c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -342,6 +342,7 @@ self: super: { HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; htsn-import = dontCheck super.htsn-import; + http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 ihaskell = dontCheck super.ihaskell; influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; @@ -437,12 +438,6 @@ self: super: { # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; - # Version 0.21.2 calls its doctest suite with incorrect paths. - haskell-gi = appendPatch super.haskell-gi (pkgs.fetchpatch { - url = https://github.com/haskell-gi/haskell-gi/pull/163/commits/b876c4f351893370d4ae597aab6ecc0422e7f665.patch; - sha256 = "03vzpvnr3vnz2zgsr504iyf0n9aw6mkz8rkj6zhazfixl3dzfkyd"; - }); - # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; |