From 87f4d7a07a076e4c879c213da3df7cfa62630cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sun, 14 Mar 2021 11:59:00 +0100 Subject: [PATCH 1/3] nixos/printing: simplify filterGutenprint function --- nixos/modules/services/printing/cupsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index b19cd0732526..d2b36d9e7541 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -104,7 +104,7 @@ let 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); From e53f145c5c591ea5c7e6a3c57b2d743632d9ec0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sun, 14 Mar 2021 12:00:46 +0100 Subject: [PATCH 2/3] canon-cups-ufr2: small refactor --- pkgs/misc/cups/drivers/canon/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 754c0f4d1d0e..0d6ec276b5f4 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }: +{ lib, stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups +, ghostscript, pkgsi686Linux, zlib }: let @@ -20,7 +21,7 @@ in stdenv.mkDerivation { pname = "canon-cups-ufr2"; - version = version; + inherit version; src = src_canon; phases = [ "unpackPhase" "installPhase" ]; From 03c98972ccb194111a2a21e34822cedabbec12fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sun, 14 Mar 2021 12:03:45 +0100 Subject: [PATCH 3/3] cups-brother-hll2340dw: remove unreferenced top-level argument --- pkgs/misc/cups/drivers/hll2340dw/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index 35d81b3da006..e61d3ace5f15 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -1,4 +1,6 @@ -{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";