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: 366fc4856a3c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6453717c6af9
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 1, 2021

  1. hledger-lib: drop obsolete overrides 

    The required versions of pretty-simple and prettyprinter are now used by
default.
    @peti
    peti committed Jan 1, 2021
    Copy the full SHA
    755b6aa View commit details

  2. QuickCheck: drop obsolete override for ghc-9.0.x 

    The 2.14.2 version is now the default.
    @peti
    peti committed Jan 1, 2021
    Copy the full SHA
    9ab73a7 View commit details

  3. splitmix: drop obsolete override 

    The 0.1.0.3 version is now the default.
    @peti
    peti committed Jan 1, 2021
    Copy the full SHA
    43804d0 View commit details

  4. pandoc: drop obsolete overrides 

    The latest versions of doctemplates and skylighting are now the default.
    @peti
    peti committed Jan 1, 2021
    Copy the full SHA
    ea9620b View commit details

  5. pandoc: re-enable the test suite 

    The errors we previously ran into have been fixed upstream.
    @peti
    peti committed Jan 1, 2021
    Copy the full SHA
    6453717 View commit details
14 changes: 1 addition & 13 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -363,9 +363,6 @@ self: super: {
punycode = dontCheck super.punycode;
pwstore-cli = dontCheck super.pwstore-cli;
quantities = dontCheck super.quantities;
QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( {
splitmix = self.splitmix_0_1_0_3;
});
redis-io = dontCheck super.redis-io;
rethinkdb = dontCheck super.rethinkdb;
Rlang-QQ = dontCheck super.Rlang-QQ;
@@ -863,8 +860,7 @@ self: super: {
swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;

# hledger-lib requires the latest version of pretty-simple
hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple_4_0_0_0; };
pretty-simple_4_0_0_0 = super.pretty-simple_4_0_0_0.overrideScope (self: super: { prettyprinter = self.prettyprinter_1_7_0; });
hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple; };

# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
@@ -1532,14 +1528,6 @@ self: super: {
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
pandoc-include-code = doJailbreak super.pandoc-include-code;

# https://github.com/jgm/pandoc/issues/6961
pandoc = dontCheck super.pandoc;

# Update pandoc dependencies to fix the build.
doctemplates = self.doctemplates_0_9;
skylighting = self.skylighting_0_10_2;
skylighting-core = self.skylighting-core_0_10_2;

# https://github.com/yesodweb/yesod/issues/1714
yesod-core = dontCheck super.yesod-core;

2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,6 @@ self: super: {
resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool;
split = doJailbreak super.split;
splitmix = self.splitmix_0_1_0_3;
tar = doJailbreak super.tar;
time-compat = doJailbreak super.time-compat;
vector = doJailbreak (dontCheck super.vector);
@@ -93,7 +92,6 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
});
QuickCheck = super.QuickCheck_2_14_2;
regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch";
sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d";
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -550,7 +550,6 @@ self: super: builtins.intersectAttrs super {

# Break infinite recursion cycle between QuickCheck and splitmix.
splitmix = dontCheck super.splitmix;
splitmix_0_1_0_3 = dontCheck super.splitmix_0_1_0_3;

# Break infinite recursion cycle between tasty and clock.
clock = dontCheck super.clock;