Commit Graph

437 Commits

Author SHA1 Message Date
Jan Tojnar
5810109b42 Merge branch 'staging-next' into staging
- readline6 attribute removed from all-packages.nix in d879125d61
- readline attribute was bumped to readline82 in 50adabdd60
2023-01-02 03:04:32 +01:00
Florian
61e561d80f
cups-brother-hll2375dw: init at 4.0.0-1 (#204306)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-12-30 22:01:06 +01:00
Sergei Trofimovich
092d57c076 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
    pkgs/development/tools/language-servers/ansible-language-server/default.nix
2022-12-28 09:35:37 +00:00
Ryan Lahfa
861c7b189c
Merge pull request #182360 from Yarny0/cups-pdf
cups-pdf(-to-pdf): init
2022-12-28 09:08:49 +01:00
Michele Guerini Rocco
5dff7733aa
Merge pull request #203454 from rnhmjoj/pr-cups-socket
nixos/hardware/printers: stop cupsd when unneeded
2022-12-21 23:06:00 +01:00
Robert Hensing
16f5747575
Merge pull request #175649 from Artturin/opt-in-structured-attrs
stdenv: support opt-in __structuredAttrs
2022-12-10 21:12:43 +01:00
Yarny0
85aeeac28d cups-pdf: add vm test 2022-12-09 22:20:09 +01:00
Yarny0
56bc902b23 cups-pdf-to-pdf: init at unstable-2021-12-22
Note that cups-pdf refuses to run without root privileges.
To use the binary, one has to either convince cups to
call it with root privileges, or install it suid root.

Also note that currently, this cups-pdf-fork produces
small pdfs with selectable text, as promised.
However, copying the text produces "garbled" text
(characters are randomly reassigned).
This is a known issue and I don't know how to fix it:

https://github.com/alexivkin/CUPS-PDF-to-PDF/issues/7
2022-12-09 22:20:08 +01:00
Artturin
c01f509e44 treewide: source .attrs in builders
if theres a source $stdenv then this is needed

for structuredAttrs
2022-12-08 21:09:02 +02:00
Martin Weinelt
60f52f6c83 Merge remote-tracking branch 'origin/staging-next' into staging 2022-12-06 01:27:11 +01:00
Sandro
fc9f1e2b48
Merge pull request #201248 from panicgh/cups-kyodialog 2022-12-05 21:05:11 +01:00
Weijia Wang
fcd6daeffe
cups: unpin 2.2.6 on darwin (#200206) 2022-12-02 02:37:13 +01:00
Nicolas Benes
909cfd2b8d cups-kyodialog: 8.1601 -> 9.2-20220928
* Rename `cups-kyodialog3` -> `cups-kyodialog`
  * Update from 8.1601 (2016) to 9.2 (2022) with support for more and
    recent printer models (170 vs. 373 PPD files)
  * Make Qt GUI optional to reduce closure size, Qt4 -> Qt5
  * Avoid full paths to kyodialog filters in PPD files. A PPD file is
    copied to /etc/cups/ppd/ for each configured printer and is not
    updated when the cups-kyodialog package is updated, thus,
    potentially creating dangling references to /nix/store or invoking
    the old version of the cups filters.
2022-12-01 23:53:34 +01:00
rnhmjoj
a5eb3b03ff
cups: fix cups.socket unit
The cups.socket unit shouldn't be part of cups.service: stopping the
service would stop the socket and break subsequent socket activations.

See https://github.com/apple/cups/issues/6005
2022-11-28 14:49:40 +01:00
Nicolas Benes
79059c9505 cups-kyocera: fix source URL 2022-11-15 00:50:02 +01:00
Yarny0
0d36fdc66b samsung-unified-linux-driver (cups driver): call {pre,post}Install
Add `preInstall` and `postInstall` to the `installPhase` to
permit package overrides to add commands to the install phase.

Suggested by r-rmcgibbo bot in
https://github.com/NixOS/nixpkgs/pull/133537#issuecomment-897437621
2022-11-06 19:28:16 +01:00
Yarny0
2c28e0dc18 cups-kyocera (cups driver): call {pre,post}Install
Add `preInstall` and `postInstall` to the `installPhase` to
permit package overrides to add commands to the install phase.

Suggested by r-rmcgibbo bot in
https://github.com/NixOS/nixpkgs/pull/133537#issuecomment-897437621
2022-11-06 19:28:15 +01:00
Yarny0
075d112131 foomatic-db-ppds (cups ppd files): init
`foomatic-db-ppds` uses the Foomatic database from the packages
`foomatic-db` and -- optionally -- `foomatic-db-nonfree`
and the perl modules from `foomatic-db-engine`
to generate about 8,800 ppd files.

The general structure of the build recipe is as follows:

* Merge `foomatic-db` and `foomatic-db-nonfree` into
  one package that represents the Foomatic database.
  The package `foomatic-db-nonfree` is optional
  as it taints the result license-wise;
  it will only be used if `withNonfreeDb`
  is to to `true` in the `callPackage` call.
  We create a tiny setup hook script that provides the combined
  database and sets an environment variable pointing to the
  database direcotry, which is expected by the foomatic engine.

* The final package's license and version are computed
  from the licenses and versions of the database packages.
  The license is set to `free` if each database-providing
  package has a free license, and to `unfree` otherwise.
  The version is simply the highest version
  of the database-providing packages.

* The final package uses `foomatic-compiledb`
  from the `foomatic-db-engine` package to extract
  all ppd files from the database packages.
  `patchPpdFilesHook` is used to patch most
  executable invocations in the ppd files
  so that they point to nix store paths.
  Finally, ppd files are gzipped to reduce storage
  (from about 550 MiB to 90 MiB installed).

The "nonfree" version of the package, i.e. the version that is
based on `foomatic-db-nonfree` in addition to `foomatic-db`,
contains about 120 additional ppd files
compared to the "free" version.
Since the "free" version already produces about 8,700
ppd files and hydra won't build the "nonfree" version,
the commit adds two package variables to `all-packages.nix`:

* `foomatic-db-ppds` is based on `foomatic-db` only
* `foomatic-db-ppds-withNonfreeDb`
  is also based on `foomaitc-db-nonfree`

The package introduced by this commit
is the result of combining other packages;
it is not the build product of a simple source tarball.
While it would also be possible to perform the ppd file
generation directly in the build process of the database
packages, this would yield further complexity as the
`foomatic-db-nonfree` package needs to be combined with the
`foomatic-db` package before ppd file extraction is possible.

There is no upstream product with a name that
could/should be used for the `name` attribute,
the variable name, or for the filename in nixpkgs.
Similar packages have different names across distributions:

* https://repology.org/projects/?search=openprinting
* https://repology.org/projects/?search=foomatic

The name `foomatic-db-ppds` seems to be most common
(albeit not really *that* common):

* https://repology.org/project/foomatic-db-ppds/versions

At least openSUSE splits their corresponding
package into multiple "binary" packages
(similar to our multi-output packages):

* https://build.opensuse.org/package/binaries/Printing/OpenPrintingPPDs/openSUSE_Tumbleweed

I considered something similar.
However, after doing some statistics,
I concluded that it's not worth the effort:
The biggest dependencies (`perl` and `cups-filters`) are
already present on most NixOS systems, and they cannot
be "split away" easily since it cannot be
done along a canonical line (e.g. printer driver).
Splitting directly by dependency risks that ppd files
unexpectedly "move from output to output" on package updates;
disappearing ppd files can be quite annoying for package users.
2022-11-06 19:28:15 +01:00
Yarny0
156cc612ff foomatic-db-nonfree (cups ppd files): init at unstable/2015-06-05
`foomatic-db-nonfree` contains -- similar to its sister
package `foomatic-db` -- knowledge about printers,
drivers, and driver options from OpenPrinting in xml files.
It needs to be combined with the `foomatic-db`
package to yield a working database.
It also provides about 100 (gzipped) ppd files.
In contrast to `foomatic-db`, this package contains
data that is provided under non-free licenses.

Quoting
https://github.com/OpenPrinting/foomatic-db-nonfree/blob/master/README

> This is a repository of PPD and Foomatic XML files that may
> have restrictions that keep them from being used on a variety
> of machines for licensing and other non-technical reasons.

ppd files can be found in
`$out/share/cups/model/foomatic-db-nonfree`.
The subdirectory `foomatic-db-nofree` is used to avoid conflicts
with other packages that might be combined with the package
`foomatic-db-nonfree` in `config.services.printing.drivers`.

ppd files in this package are *not* patched
to call executables from the nix store:
The only executable "rastertophaser6100" that is
called from ppd files isn't available in nixpkgs.

There is a daily snapshot of a source archive available at
https://www.openprinting.org/download/foomatic/ .
However, these files rotate daily and
cannot be used as a stable download source.
So we rely on OpenPrinting's Github repository
instead and pinpoint a fresh commit.
Note that the current version is from 2015,
so updates are unlikely.
2022-11-06 19:28:15 +01:00
Yarny0
90a8a78e7c foomatic-db (cups ppd files): init at unstable/2022-10-03
`foomatic-db` contains the collected knowledge about printers,
drivers, and driver options from OpenPrinting in xml files.
It also provides thousands of ppd files.
The build process patches those files to reference executables
in the nix store and gzips them to reduce storage
(from about 670 MiB to 90 MiB installed).

In contrast to the sister package `foomatic-db-nonfree`
(packaged in a follow-up commit),
this package only includes files published under a free license.
Most files are published under the GPL,
some under the MIT license.
For details see
https://github.com/OpenPrinting/foomatic-db/blob/master/COPYING .
To encompass the different licenses, the package's
license is set to "free" as the common denominator.

ppd files can be found in `$out/share/cups/model/foomatic-db`.
The subdirectory `foomatic-db` is used to avoid conflicts
with other packages that might be combined with the package
`foomatic-db` in `config.services.printing.drivers`.

There is a daily snapshot of a source archive available at
https://www.openprinting.org/download/foomatic/ .
However, these files rotate daily and
cannot be used as a stable download source.
So we rely on OpenPrinting's Github repository
instead and pinpoint a fresh commit.
2022-11-06 19:28:15 +01:00
Yarny0
cd4c8d63f5 foomatic-db-engine: init at unstable-2022-05-03
`foomatic-db-engine` contains several perl scripts to parse
and process XML files from the Foomatic database packages.
It can be used to extract ppd files,
which will be accomplished in a follow-up commit.

The package also contains scripts
to handle print queues and jobs.
It can -- optionally -- talk to the local cups server,
to network printers and to SMB print servers.
The build recipe contains switches to enable these features;
however, they are not needed when generating ppd files.

There is a daily snapshot of a source archive available at
https://www.openprinting.org/download/foomatic/ .
However, these files rotate daily and
cannot be used as a stable download source.
So we rely on OpenPrinting's Github repository
instead and pinpoint a fresh commit.
2022-11-06 19:28:15 +01:00
Yarny0
bafefd7ae2 samsung-unified-linux-driver (cups driver): patch all filters
ppd files in the `samsung-unified-linux-driver`
package invoke these filter commands:

* pstosecps
* pstospl
* rastertospl
* pstosplc

The paths to all of those commands excluding the last one got
patched with their absolute paths during the build process.
This commit adds the last one to
the list of commands to be patched.
2022-11-06 16:19:23 +01:00
Yarny0
bfe3271fc0 samsung-unified-linux-driver (cups driver): use patchPpdFilesHook
The `sed` script in the `installPhase` is removed.
Instead, the setup hook `patchPpdFilesHook` is
used to patch the path to the filter executables.

The result should essentially be the same.
Comparing the generated ppd files showed no difference,
short of the package's hash in the absolute paths and
added newline characters at the end of some ppd files.
Missing newline characters at the end of the last line are
apparently added by `awk`; this shouldn't affect functionality.
The new package also contains a `propagated-build-inputs`
file which propagates the package itself.
This ensures the package is available whenever
a ppd file is singled out by another package.
2022-11-06 16:19:23 +01:00
Yarny0
bf30b53817 cups-kyocera (cups driver): use patchPpdFilesHook
The `sed` script in the `installPhase` is removed.
Instead, the setup hook `patchPpdFilesHook`
is used to patch the path to `rastertokpsl`.

The result should essentially be the same.
Comparing the generated ppd files showed no difference
(short of the package's hash in the absolute paths).
The new package also contains a `propagated-build-inputs`
file which propagates the package itself.
This ensures the package is available whenever
a ppd file is singled out by another package.
2022-11-06 16:19:22 +01:00
Yarny0
ef8566f38b cups-drv-rastertosag-gdi (cups driver): patch ppd bin paths
The `cups-drv-rastertosag-gdi` CUPS printer driver
package provides a filter executable `rastertosag-gdi`
and two ppd files that reference the filter file.
The commit at hand uses `patchPpdFilesHook` to
replace calls to the filter executable with
absolute paths to increase package purity.
2022-11-06 16:19:22 +01:00
Yarny0
6f622e91c5 cups-drv-rastertosag-gdi (cups driver): gzip ppd files
ppd files are gzipped to save some space.
The `gzip` "-n" option prevents gzip from storing
a timestamp, thus facilitating reproducibility.
2022-11-06 16:19:22 +01:00
Yarny0
5222363936 cups-drv-rastertosag-gdi (cups driver): fix simple comment typo 2022-11-06 16:19:22 +01:00
Weijia Wang
f09703cd25 cups: fix build on darwin 2022-11-03 00:28:21 +01:00
github-actions[bot]
f4c71b2f8c
Merge staging-next into staging 2022-10-23 18:02:19 +00:00
AndersonTorres
3888878db6 samsung cups driver: remove tohl from meta.maintainers list
Because tohl disappeared (last seen 2021-01-28).
2022-10-23 11:30:39 -03:00
Rick van Schijndel
ae33e7cf40 cups: support prefixed pkg-config
Otherwise configure fails with the following error:
- configure: error: Need pkg-config to enable libusb support.
2022-10-19 20:38:28 +02:00
Artturin
0734f54ef2 treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs
found with nixpkgs-lint
2022-09-26 17:53:26 +03:00
Jonas Heinrich
02736966da
Merge pull request #166240 from r-ryantm/auto-update/cups-filters
cups-filters: 1.28.12 -> 1.28.13
2022-08-27 09:38:48 +02:00
Nathan Parsons
308b5776a2
cnijfilter2: 6.10 -> 6.40 (#180681)
* cnijfilter2: 6.10 -> 6.40

* Fix compilation error related to duplicate definitions of GET_PROTOCOL

- Resolves the compilation issue reported at https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711
- An identical issue was previously reported in Gentoo: https://bugs.gentoo.org/723186
- This patch is taken from the solution of Alfredo Tupone (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64544b43f2c14be54531ad8764419dde09)

Co-authored-by: Nathan Parsons <nathan@parsons.digital>
2022-07-22 22:16:37 +02:00
R. Ryantm
8829416344 cups-filters: 1.28.12 -> 1.28.15 2022-07-07 21:16:50 +00:00
Sandro Jäckel
4d6eacab55
canon-cups-ufr2: fix libdir pointing to bindir, little format 2022-07-04 22:16:11 +02:00
ajs124
fa32663f50 maintainers: remove fuzzy-id
no github account linked
2022-06-29 00:55:00 +02:00
Robert Scott
eb6cce7d6f treewide/misc: add sourceType binaryNativeCode for more packages 2022-06-17 22:55:24 +01:00
Martin Weinelt
68b24492ec
Merge pull request #174898 from LeSuisse/cups-2.4.2 2022-05-28 12:47:43 +02:00
Thomas Gerbet
c590c23f49 cups: 2.4.1 -> 2.4.2
Fixes CVE-2022-26691.
https://github.com/OpenPrinting/cups/releases/tag/v2.4.2
2022-05-27 14:33:28 +02:00
Artturin
c1fffdfffb treewide: change some glibc to stdenv.cc.libc 2022-05-27 05:57:43 +03:00
Artturin
0c4d65b21e treewide: stdenv.glibc -> glibc 2022-05-25 15:51:20 +03:00
Rick van Schijndel
d14b6e65ff samsung-unified-linux-driver_4_00_39: drop
Broken since 2018-10-03
2022-05-11 19:23:05 +02:00
hexchen
3612596e61 cups-kyodialog3: fix download URL 2022-04-28 22:10:25 +00:00
Ben Siraphob
21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs 2022-03-30 20:17:24 -05:00
Bernardo Meurer
057a4d3abf
cups-brother-mfcl2750dw: fix download url 2022-03-23 16:41:33 -07:00
Bernardo Meurer
a3cfdf39a7
cups-brother-mfcl2750dw: init at 4.0.0-1 2022-03-23 14:49:49 -07:00
AndersonTorres
ed2b1b4b90 Merge branch 'master' into staging-next 2022-02-26 21:04:25 -03:00
R. Ryantm
c88fc7454a cups-filters: 1.28.11 -> 1.28.12 2022-02-25 23:21:44 +01:00
zseri
9a93279738 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; };
2022-02-23 23:38:05 +01:00