Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 009c50976b5b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 674ab2dffa58
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Jul 11, 2020

  1. [20.03]: haskellPackages.lambdabot: Drop broken overrides

    @srhb
    srhb committed Jul 11, 2020
    Copy the full SHA
    cf63841 View commit details

  2. texlive.bin: fix poppler compatibility patch urls (#91890) 

    (cherry picked from commit 4ab0be8)
    @dylex @veprbl
    dylex authored and veprbl committed Jul 11, 2020
    Copy the full SHA
    09b9d4d View commit details

Commits on Jul 12, 2020

  1. Merge pull request #92963 from srhb/droplambdaoverrides 

    [20.03]: haskellPackages.lambdabot: Drop broken overrides
    @cdepillabout
    cdepillabout authored Jul 12, 2020
    Copy the full SHA
    674ab2d View commit details
Showing with 2 additions and 5 deletions.
  1. +0 −3 pkgs/development/haskell-modules/configuration-common.nix
  2. +2 −2 pkgs/tools/typesetting/tex/texlive/bin.nix
3 changes: 0 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1212,9 +1212,6 @@ self: super: {

# These packages needs network 3.x, which is not in LTS-13.x.
network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; };
lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; });

# Some tests depend on a postgresql instance
# Haddock failure: https://github.com/haskell/haddock/issues/979
4 changes: 2 additions & 2 deletions pkgs/tools/typesetting/tex/texlive/bin.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ let
};
in fetchurl {
name = "pdftoepdf-poppler${popplerVersion}.cc";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959";
sha256 = "0pngvw1jgnm4cqskrzf5a3z8rj4ssl10007n3wbblj50hvvzjph3";
postFetch = ''
# The trunk added some extra arguments to certain functions so we need to revert that
@@ -56,7 +56,7 @@ let
};
pdftosrc = fetchurl {
name = "pdftosrc-poppler${popplerVersion}.cc";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co";
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959";
sha256 = "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380";
};
in ''