public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sandro 2021-03-14 17:49:41 +01:00 committed by GitHub
commit 5caaae33fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/printing/cupsd.nix
View File

@ -104,7 +104,7 @@ let
ignoreCollisions = true; 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; containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
getGutenprint = pkgs: head (filterGutenprint pkgs); getGutenprint = pkgs: head (filterGutenprint pkgs);

5
pkgs/misc/cups/drivers/canon/default.nix
View File

@ -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 let
@ -20,7 +21,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "canon-cups-ufr2"; pname = "canon-cups-ufr2";
version = version; inherit version;
src = src_canon; src = src_canon;
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];

4
pkgs/misc/cups/drivers/hll2340dw/default.nix
View File

@ -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 let
version = "3.2.0-1"; version = "3.2.0-1";