public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell: fix builds broken by LTS-9 update

Browse Source
This commit is contained in:
Peter Simons 2017-07-27 16:09:39 +02:00
parent f442bbcdec
commit cb1742e76d
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -702,12 +702,6 @@ self: super: {
# broken test suite # broken test suite
servant-server = dontCheck super.servant-server; servant-server = dontCheck super.servant-server;
# Fix build for latest versions of servant and servant-client.
servant-client_0_11 = super.servant-client_0_11.overrideScope (self: super: {
servant-server = self.servant-server_0_11;
servant = self.servant_0_11;
});
# build servant docs from the repository # build servant docs from the repository
servant = servant =
let let
@ -865,9 +859,6 @@ self: super: {
postInstall = "rm $out/bin/mkReadme && rmdir $out/bin"; postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
}); });
# Needs a newer version of hsyslog than lts-8.x provides.
logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; };
# Has a dependency on outdated versions of directory. # Has a dependency on outdated versions of directory.
cautious-file = doJailbreak (dontCheck super.cautious-file); cautious-file = doJailbreak (dontCheck super.cautious-file);
@ -877,4 +868,13 @@ self: super: {
# Needs a newer version of ghc-events. # Needs a newer version of ghc-events.
threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; }; threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; };
# version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7
ChasingBottoms = doJailbreak super.ChasingBottoms;
# test suite does not compile with recent versions of QuickCheck
integer-logarithms = dontCheck (super.integer-logarithms);
# https://github.com/vincenthz/hs-tls/issues/247
tls = dontCheck super.tls;
} }

9
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -59,15 +59,6 @@ self: super: {
# https://github.com/nominolo/ghc-syb/issues/20 # https://github.com/nominolo/ghc-syb/issues/20
ghc-syb-utils = dontCheck super.ghc-syb-utils; ghc-syb-utils = dontCheck super.ghc-syb-utils;
# Older, LTS-8-based versions don't compile.
base-orphans = self.base-orphans_0_6;
hspec-meta = self.hspec-meta_2_4_4;
lens = self.lens_4_15_3;
primitive = self.primitive_0_6_2_0;
semigroupoids = self.semigroupoids_5_2;
syb = self.syb_0_7;
vector = super.vector_0_12_0_1;
# Work around overly restrictive constraints on the version of 'base'. # Work around overly restrictive constraints on the version of 'base'.
ChasingBottoms = doJailbreak super.ChasingBottoms; ChasingBottoms = doJailbreak super.ChasingBottoms;
hashable = doJailbreak super.hashable; hashable = doJailbreak super.hashable;