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: 426d6e3303fc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a4bcb07294b7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 27, 2018

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

    @peti
    peti committed Nov 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 43C9E53FFCF51DEC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6624bdc View commit details

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

    @peti
    peti committed Nov 27, 2018
    Copy the full SHA
    a4bcb07 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
4 changes: 3 additions & 1 deletion pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ self: super: {

# LTS-12.x versions do not compile.
base-orphans = self.base-orphans_0_8;
brick = self.brick_0_41_4;
brick = self.brick_0_41_5;
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;
@@ -69,6 +69,8 @@ self: super: {
lens = self.lens_4_17;
megaparsec = dontCheck (doJailbreak super.megaparsec);
pandoc = self.pandoc_2_5;
pandoc-citeproc = self.pandoc-citeproc_0_15;
pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
patience = markBrokenVersion "0.1.1" super.patience;
polyparse = self.polyparse_1_12_1;
primitive = self.primitive_0_6_4_0;