From a91e85efa3d9b39b9b9930fd7a961192b9a1c754 Mon Sep 17 00:00:00 2001
From: zseri <zseri.devel@ytrizja.de>
Date: Thu, 2 Dec 2021 09:28:21 +0100
Subject: cups-filters: run nixpkgs-fmt

---
 pkgs/misc/cups/filters.nix | 50 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

(limited to 'pkgs/misc/cups')

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index a20e3b71b09..a4cb617a22a 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,13 +1,36 @@
-{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig
-, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
-, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
-, mupdf, dejavu_fonts, liblouis
+{ lib
+, avahi
+, bc
+, coreutils
+, cups
+, dbus
+, dejavu_fonts
+, fetchurl
+, fontconfig
+, gawk
+, ghostscript
+, gnugrep
+, gnused
+, ijs
+, libjpeg
+, liblouis
+, libpng
+, makeWrapper
+, mupdf
+, perl
+, pkg-config
+, poppler
+, poppler_utils
+, qpdf
+, stdenv
+, which
 }:
 
 let
-  binPath = lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];
+  binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ];
 
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "cups-filters";
   version = "1.28.11";
 
@@ -19,9 +42,20 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config makeWrapper ];
 
   buildInputs = [
-    cups poppler poppler_utils fontconfig libjpeg libpng perl
-    ijs qpdf dbus avahi ghostscript mupdf
+    avahi
+    cups
+    dbus
+    fontconfig
+    ghostscript
+    ijs
+    libjpeg
     liblouis # braille embosser support
+    libpng
+    mupdf
+    perl
+    poppler
+    poppler_utils
+    qpdf
   ];
 
   configureFlags = [
-- 
cgit 1.4.1


From 9a93279738708df0801185a35fb31671b4616b70 Mon Sep 17 00:00:00 2001
From: zseri <zseri.devel@ytrizja.de>
Date: Thu, 2 Dec 2021 09:30:27 +0100
Subject: cups-filters: make it easier to disable avahi

: previous override code to do this was :
  cups-filters = prev.lib.pipe prev.cups-filters [
    (x: x.overrideAttrs (old: { configureFlags = old.configureFlags ++ ["--disable-avahi"]; }))
    (x: x.override { avahi = null; })
  ];

: new override code to do this is :
  cups-filters = prev.cups-filters.override { withAvahi = false; };
---
 pkgs/misc/cups/filters.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc/cups')

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index a4cb617a22a..5efa78edcd9 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -24,6 +24,7 @@
 , qpdf
 , stdenv
 , which
+, withAvahi ? true
 }:
 
 let
@@ -42,7 +43,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config makeWrapper ];
 
   buildInputs = [
-    avahi
     cups
     dbus
     fontconfig
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     poppler
     poppler_utils
     qpdf
-  ];
+  ] ++ lib.optionals withAvahi [ avahi ];
 
   configureFlags = [
     "--with-mutool-path=${mupdf}/bin/mutool"
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf"
     "--localstatedir=/var"
     "--sysconfdir=/etc"
-  ];
+  ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ];
 
   makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ];
 
-- 
cgit 1.4.1


From c88fc7454a9b27d67f733143fc41547f10c5feae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Feb 2022 14:43:21 +0000
Subject: cups-filters: 1.28.11 -> 1.28.12

---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc/cups')

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 5efa78edcd9..fdf4f163ba8 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cups-filters";
-  version = "1.28.11";
+  version = "1.28.12";
 
   src = fetchurl {
     url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
-    sha256 = "sha256-KYbLSNE0Db5XnELAjCqINYem2+WUNuQi9BhMzQqWZm0=";
+    sha256 = "sha256-RuLqPYhK0iK7hjzmUR5ZzzkO+Og1KVvkSoDlALKjOjo=";
   };
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
-- 
cgit 1.4.1