Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

5 files changed, 12 insertions, 42 deletions

diff --git a/nixpkgs/pkgs/misc/cups/cups-clean-dirty.patch b/nixpkgs/pkgs/misc/cups/cups-clean-dirty.patch
deleted file mode 100644
index 0bdc8198e8fb..000000000000
--- a/nixpkgs/pkgs/misc/cups/cups-clean-dirty.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/scheduler/main.c b/scheduler/main.c
-index 8925c8373..acf031684 100644
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -893,7 +893,7 @@ main(int  argc,				/* I - Number of command-line args */
-     * Write dirty config/state files...
-     */
- 
--    if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0)
-+    if (DirtyCleanTime && current_time >= DirtyCleanTime)
-       cupsdCleanDirty();
- 
- #ifdef __APPLE__
diff --git a/nixpkgs/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix
index 227886e126fc..f691444c1afb 100644
--- a/nixpkgs/pkgs/misc/cups/default.nix
+++ b/nixpkgs/pkgs/misc/cups/default.nix
@@ -10,27 +10,21 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "cups-${version}";
-  version = "2.2.6";
+
+  # After 2.2.6, CUPS requires headers only available in macOS 10.12+
+  version = if stdenv.isDarwin then "2.2.6" else "2.2.10";
 
   passthru = { inherit version; };
 
   src = fetchurl {
     url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
-    sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20";
+    sha256 = if version == "2.2.6"
+             then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
+             else "1fq52aw1mini3ld2czv5gg37wbbvh4n7yc7wzzxvbs3zpfrv5j3p";
   };
 
   outputs = [ "out" "lib" "dev" "man" ];
 
-  patches = [
-    (fetchpatch {
-      name = "cups"; # weird name to avoid change (for now)
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch"
-          + "?h=packages/cups&id=41fefa22ac518";
-      sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";
-    })
-    ./cups-clean-dirty.patch
-  ];
-
   postPatch = ''
     substituteInPlace cups/testfile.c \
       --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin'
diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
index 9aa127dd6305..17040498acc0 100644
--- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
@@ -3,11 +3,11 @@ mfcl8690cdwlpr, perl, stdenv}:
 
 stdenv.mkDerivation rec {
   name = "mfcl8690cdwcupswrapper-${version}";
-  version = "1.3.0-0";
+  version = "1.4.0-0";
 
   src = fetchurl {
     url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb";
-    sha256 = "16nnh3hd5yv0m4191wja9fvxxzngzfccfj2rfhcswbakajyk5ywn";
+    sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
index 3b6ae73c70d1..a521b3ea0218 100644
--- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
@@ -3,11 +3,11 @@ makeWrapper, perl, pkgs, stdenv, which }:
 
 stdenv.mkDerivation rec {
   name = "mfcl8690cdwlpr-${version}";
-  version = "1.2.0-0";
+  version = "1.3.0-0";
 
   src = fetchurl {
     url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb";
-    sha256 = "02k43nh51pn4lf7gaid9yhil0a3ikpy4krw7dhgphmm5pap907sx";
+    sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix
index 9eeadda73fc8..348b7c6550e2 100644
--- a/nixpkgs/pkgs/misc/cups/filters.nix
+++ b/nixpkgs/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 = [