Commit cb1742e7 authored by Peter Simons's avatar Peter Simons
Browse files

haskell: fix builds broken by LTS-9 update

parent f442bbcd

pkgs/development/haskell-modules/configuration-common.nix

+9 −9
Original line number Diff line number Diff line
@@ -702,12 +702,6 @@ self: super: { 
  # broken test suite

  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

  servant =

    let
@@ -865,9 +859,6 @@ self: super: { 
    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.

  cautious-file = doJailbreak (dontCheck super.cautious-file);
@@ -877,4 +868,13 @@ self: super: { 
  # Needs a newer version of ghc-events.

  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;



}

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

+0 −9
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ self: super: { 
  # https://github.com/nominolo/ghc-syb/issues/20

  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'.

  ChasingBottoms = doJailbreak super.ChasingBottoms;

  hashable = doJailbreak super.hashable;