about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-12-25 16:34:54 +0100
committerGitHub <noreply@github.com>2018-12-25 16:34:54 +0100
commit4c5a5dc6270d0552f71937d5d73cc36a7f3a2326 (patch)
tree780eb86fa7c2163093f2b4c795fcf20e40670a6f /pkgs/misc
parentd406ea6d8e53543d3c8bd9d0c951062dc0aca724 (diff)
parente16ec2920a785f5183ea2c10a051772abc8c6404 (diff)
downloadnixlib-4c5a5dc6270d0552f71937d5d73cc36a7f3a2326.tar
nixlib-4c5a5dc6270d0552f71937d5d73cc36a7f3a2326.tar.gz
nixlib-4c5a5dc6270d0552f71937d5d73cc36a7f3a2326.tar.bz2
nixlib-4c5a5dc6270d0552f71937d5d73cc36a7f3a2326.tar.lz
nixlib-4c5a5dc6270d0552f71937d5d73cc36a7f3a2326.tar.xz
nixlib-4c5a5dc6270d0552f71937d5d73cc36a7f3a2326.tar.zst
nixlib-4c5a5dc6270d0552f71937d5d73cc36a7f3a2326.zip
Merge pull request #52715 from jtojnar/poppler-0.72
poppler: 0.67.0 → 0.72.0
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/cups/filters.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 9eeadda73fc8..348b7c6550e2 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -2,7 +2,6 @@
 , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
 , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
 , mupdf
-, fetchpatch
 }:
 
 let
@@ -10,23 +9,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.20.4";
+  version = "1.21.6";
 
   src = fetchurl {
     url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k";
+    sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3";
   };
 
-  patches = [
-    # This patch fixes cups-filters when compiled with poppler-0.67.0.
-    # Issue: https://github.com/OpenPrinting/cups-filters/pull/50
-    # PR: https://github.com/OpenPrinting/cups-filters/pull/51
-    (fetchpatch {
-      url = "https://github.com/OpenPrinting/cups-filters/commit/219de01c61f3b1ec146abf142d0dfc8c560cc58e.patch";
-      sha256 = "0f0lql3rbm2g8mxrpigfyi8fb4i2g4av20g417jzdilp60jq0ny8";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig makeWrapper ];
 
   buildInputs = [