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

Commits on Nov 6, 2020

  1. pandoc: update override for the new version

    @peti
    peti committed Nov 6, 2020
    Copy the full SHA
    663c657 View commit details

  2. haskell-configuration-common: cosmetic

    @peti
    peti committed Nov 6, 2020
    Copy the full SHA
    88299d2 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/development/haskell-modules/configuration-common.nix
5 changes: 2 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1468,15 +1468,14 @@ self: super: {
skylighting-core = doDistribute super.skylighting-core_0_10_0_3;
hslua = doDistribute self.hslua_1_1_2;
jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
pandoc = doDistribute self.pandoc_2_11_0_4;
pandoc = doDistribute self.pandoc_2_11_1;
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2);
pandoc-types = doDistribute self.pandoc-types_1_22;
rfc5051 = doDistribute self.rfc5051_0_2;

# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
domain-auth = dontCheck super.domain-auth;
# INSERT NEW OVERRIDES ABOVE THIS LINE

# stack-2.5.1 needs a more current version of pantry to compile
pantry = self.pantry_0_5_1_3;
@@ -1486,7 +1485,7 @@ self: super: {

autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; };

# haskell-language-server needs a more current version of pantry to compile
# INSERT NEW OVERRIDES ABOVE THIS LINE
} // (let
inherit (self) hls-ghcide hls-brittany;
hlsScopeOverride = self: super: {