1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Commit graph

464 commits

Author SHA1 Message Date
Weijia Wang 6bd9402c5f cups: fix build on darwin 2023-06-03 01:35:10 +02:00
Martin Weinelt 2ca22f6b82
cups: 2.4.2 -> 2.4.3
Resolves a heap buffer overflow in the log formatter, when the log level
is set to DEBUG.

https://github.com/OpenPrinting/cups/releases/tag/v2.4.3

Fixes: CVE-2023-32234
2023-06-02 02:05:43 +02:00
Martin Weinelt 84fb288f46
cups: fix nixos test references
The tests were split up in two, but the references were not updated.
2023-06-02 02:05:13 +02:00
Bernardo Meurer 9232113fa0
Merge pull request #234509 from lluchs/canon-cups-ufr2-5.70 2023-05-31 09:53:25 -04:00
Lukas Werling 96bd243f4e canon-cups-ufr2: Add myself as maintainer 2023-05-30 20:51:38 +02:00
Lukas Werling ec2fff31a8 canon-cups-ufr2: Remove 32-bit x86 libraries
Canon's official RPM packages don't include 32-bit libraries anymore, so
I don't think they are needed in any way. Even if they were still useful
in some way, they are not packaged correctly anymore.
2023-05-30 20:32:35 +02:00
Lukas Werling b78630ad3b canon-cups-ufr2: Fix printing on USB printers
Lots of little issues, mostly due to new applications that weren't
patched properly yet and have references to /usr/bin. The driver now
successfully prints on my Canon iR1022, and probably other similar USB
printers.
2023-05-30 20:25:23 +02:00
Weijia Wang b5de94e8a7 cups-filters: 1.28.15 -> 1.28.17 2023-05-26 21:58:03 +03:00
Lukas Werling 657e05cab0 canon-cups-ufr2: Remove libglade-2 buildInput
Despite being mentioned by the README, this dependency appears to be
unused.
2023-05-26 12:11:16 +02:00
Lukas Werling b196c7eb8b canon-cups-ufr2: Implement build for aarch64
This also replaces proot with libredirect since I could not get proot to
build under aarch64.
2023-05-26 12:07:59 +02:00
Yaya bb8168bf78 cups-filters: Fix CVE-2023-24805
https://github.com/OpenPrinting/cups-filters/security/advisories/GHSA-gpxc-v2m8-fr3x
2023-05-23 21:33:00 +00:00
Lukas Werling bf6797fc1c canon-cups-ufr2: 5.40 -> 5.70 2023-05-17 15:15:55 +02:00
Sandro 2e532b8b26
Merge pull request #222837 from aplund/brother-hl-l3230cdw
cups-drivers: Brother HL-L3230CDW driver version 1.0.2-0
2023-04-18 16:54:35 +02:00
Austin Lund 90e2c6f570 cups-brother-hll3230cdw: init at version 1.0.2
Brother HL-L3230CDW driver for CUPS.
2023-04-16 08:18:08 +10:00
Yarny0 f81afb13d4 foomatic-db: unstable-2022-10-03 -> unstable-2023-03-30
introduces a couple of ppd files for Ricoh printers
2023-04-01 09:00:13 +02:00
Yarny0 47bcfe5162 foomatic-db{,-nonfree,-engine}: add meta.changelog 2023-04-01 08:59:42 +02:00
Martin Weinelt f7d6afe0db
mfc5890cncupswrapper: Fix illegal meta key 2023-03-26 16:02:26 +02:00
Martin Ramm 38ac9d077a mfc5890cncupswrapper: init at 1.1.2-2 2023-03-26 14:43:05 +02:00
Martin Ramm e2871a593c mfc5890cnlpr: init at 1.1.2-2 2023-03-19 00:51:48 +01:00
K900 68cd4eeded cups-filters: fix build with qpdf >= 11.3.0 2023-03-11 10:23:11 +03:00
Artturin f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin 6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Felix Buehler cdb39a86e0 treewide: use optionalString 2023-02-13 21:52:34 +01:00
Weijia Wang 237608ca10 fxlinuxprint: fix src 2023-02-07 18:27:02 +01:00
Krzysztof Kotlenga bf4959f1a5 mfcl8690cdwlpr: Make it installable on x86_64-linux
This seems like a strange omission, because it works without a hitch.
Tested using cups and mfcl8690cdwcupswrapper, which uses this package.
2023-01-24 21:57:04 +01:00
Sandro Jäckel 09e07a3ad3
cups: remove with lib over entire file 2023-01-23 22:45:25 +01:00
Adam Joseph 42815b4a0c treewide: systemdSupport: use lib.meta.availableOn
Many packages have some kind of flag indicating whether or not to build with
systemd support.  Most of these default to `stdenv.isLinux`, but systemd does
not build on (and is marked `broken` for) `isStatic`.  Only a few packages have
the needed `&& !isStatic` in the default value for their parameter.

This commit moves the logic for the default value of these flags into
`systemd.meta.{platforms,badPlatforms}` and evaluates those conditions using
`lib.meta.availableOn`.

This provides three benefits:

1. The default values are set correctly (i.e. including `&& isStatic`)

2. The default values are set consistently

3. The way is paved for any future non-Linux systemd platforms (FreeBSD is
   reported to have experimental systemd support)
2023-01-22 00:27:19 -08:00
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