Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6f908e5ba508
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 774a02b6a334
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 27, 2018

  1. haskell-fgl: update ghc-8.6.x build to latest version

    @peti
    peti committed Nov 27, 2018

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    ea02df1 View commit details

  2. haskell-pandoc: update ghc-8.6.x build to latest version

    @peti
    peti committed Nov 27, 2018
    Copy the full SHA
    774a02b View commit details
Showing with 2 additions and 68 deletions.
  1. +2 −7 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
  2. +0 −61 pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
9 changes: 2 additions & 7 deletions pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@ self: super: {
cassava-megaparsec = doJailbreak super.cassava-megaparsec;
config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
contravariant = self.contravariant_1_5;
fgl = self.fgl_5_7_0_1;
free = self.free_5_1;
haddock-library = dontCheck super.haddock-library_1_7_0;
HaTeX = doJailbreak super.HaTeX;
@@ -67,6 +68,7 @@ self: super: {
JuicyPixels = self.JuicyPixels_3_3_2;
lens = self.lens_4_17;
megaparsec = dontCheck (doJailbreak super.megaparsec);
pandoc = self.pandoc_2_5;
patience = markBrokenVersion "0.1.1" super.patience;
polyparse = self.polyparse_1_12_1;
primitive = self.primitive_0_6_4_0;
@@ -81,10 +83,6 @@ self: super: {
# https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers;

# https://github.com/haskell/fgl/issues/79
# https://github.com/haskell/fgl/issues/81
fgl = appendPatch (overrideCabal super.fgl (drv: { editedCabalFile = null; })) ./patches/fgl-monad-fail.patch;

# Test suite does not compile.
cereal = dontCheck super.cereal;
data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
@@ -99,9 +97,6 @@ self: super: {
# https://github.com/jgm/skylighting/issues/55
skylighting-core = dontCheck super.skylighting-core;

# https://github.com/jgm/pandoc/issues/4974
pandoc = doJailbreak super.pandoc_2_4;

# Break out of "yaml >=0.10.4.0 && <0.11".
stack = doJailbreak super.stack;

61 changes: 0 additions & 61 deletions pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
View file

This file was deleted.