Merge pull request #116303 from samuelgrf/printing-related-refactors

nixos/modules/services/printing/cupsd.nix

···
     ignoreCollisions = true;
   };
 
-  filterGutenprint = pkgs: filter (pkg: pkg.meta.isGutenprint or false == true) pkgs;
+  filterGutenprint = filter (pkg: pkg.meta.isGutenprint or false == true);
   containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
   getGutenprint = pkgs: head (filterGutenprint pkgs);
 

pkgs/misc/cups/drivers/canon/default.nix

···
-{lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }:
+{ lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups
+, ghostscript, pkgsi686Linux, zlib }:
 
 let
 
···
 
 stdenv.mkDerivation {
   pname = "canon-cups-ufr2";
-  version = version;
+  inherit version;
   src = src_canon;
 
   phases = [ "unpackPhase" "installPhase" ];

pkgs/misc/cups/drivers/hll2340dw/default.nix

···
-{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which}:
+{ lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file
+, a2ps, coreutils, perl, gnugrep, which
+}:
 
 let
   version = "3.2.0-1";