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

Commits on Oct 20, 2019

  1. Revert "poppler: 0.74.0 -> 0.79.0" 

    texlive.bin fails to build.

This reverts commit 6b58b46.
This reverts commit 1caceac.
This reverts commit 9908cad.
    @FRidh
    FRidh committed Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b5e481a View commit details

  2. Revert "poppler: 0.79.0 -> 0.81.0" 

    Reverting because this breaks texlive.bin.

This reverts commit 192e73f.
    @FRidh
    FRidh committed Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5118f12 View commit details

  3. Merge staging-next into staging

    @FRidh
    FRidh committed Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e91f8dd View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 pkgs/development/libraries/poppler/default.nix
12 changes: 10 additions & 2 deletions pkgs/development/libraries/poppler/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,19 +8,27 @@
}:

let # beware: updates often break cups-filters build
version = "0.81.0";
version = "0.74.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";

src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "00pykc7nym3xg0wc60awv0i35zwdfyn0igb6jrnb6rsv0c5h4b91";
sha256 = "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j";
};

outputs = [ "out" "dev" ];

patches = [
(fetchpatch {
name = "CVE-2019-9959.patch";
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/68ef84e5968a4249c2162b839ca6d7975048a557.patch";
sha256 = "17a3qs74fnnrhjys23f4aw5y7yfsk5d507jcj4hh1bndqv6dpwg1";
})
];

buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;

# TODO: reduce propagation to necessary libs