Commit graph

306 commits

Author SHA1 Message Date
Sergey Trofimov
2c48201171
gnu: hplip: Make SANE backend truly pluggable.
* gnu/packages/cups.scm (hplip)[#:phases]
<move-sane-config-to-dll.d>: Fix dynamic loading.

Change-Id: I5ae3edabf8ccb87d547990f641fe42d2260e9080
2025-09-27 16:55:04 -04:00
Sergey Trofimov
9f1105ec50
gnu: sane-backends-minimal: Rename to sane.
sane-backends-minimal contains helper programs and library files, but
none of the backends. Renaming the package to avoid confusion.

* gnu/packages/scanner.scm (sane-backends-minimal): Rename to...
(sane): ... this.
(utsushi, hplip, hplip-minimal)[inputs]: Replace sane-backends-minimal
with sane.

Change-Id: If987248f0ad8ac7041454a164d905c1c069242b7
2025-09-27 16:55:02 -04:00
Sergey Trofimov
1a4baddc0b
gnu: cups: Don't enforce root ownership on supplementary files.
Printers managed by CUPS might require supplementary files to function,
such as color profiles or filters. CUPS checks permissions on such files
to prevent the execution of unsafe code. One of the conditions-that the
files are owned by root-must be short-circuited on Guix, because this
condition cannot be met on a system with an unprivileged daemon (where
store files are owned by `guix-daemon`).

* gnu/packages/patches/cups-relax-root-ownership-check.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/cups.scm (cups)[source]: Include it.

Change-Id: I77f67f996d057a34bd018ab97cda54577060b0c3
Signed-off-by: John Kehayias <john@guixotic.coop>
2025-09-27 16:54:28 -04:00
John Kehayias
730f73121d
gnu: cups: Update to 2.4.14 [security-fixes].
Fixes CVE-2025-58060 and CVE-2025-58364.

* gnu/packages/cups.scm(cups): Update to 2.4.14.
[source]: Drop unneeded patch.
* gnu/packages/patches/cups-minimal-Address-PPD-injection-issues.patch: Remove
it.
* gnu/local.mk (dist_patch_DATA): Deregister it.

Change-Id: I719e568716c8739aca16c6ebc29f50c7d2ac83bc
2025-09-27 16:54:26 -04:00
Maxim Cournoyer
10482f731e
Reapply "Update Maxim's email address."
This reverts commit a7db92d9b3, this time with
the more careful command, to avoid a world rebuild:

grep -rl --exclude-dir=build --exclude-dir=patches --exclude=ld-wrapper.in \
  --exclude=sitecustomize.py --exclude=guix-emacs.el maxim.cournoyer@gmail.com |
  xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'

Change-Id: I0871f5cf9ace79e34e78e24154d0da6ea95a3a91
2025-09-18 13:44:12 +09:00
Maxim Cournoyer
a7db92d9b3
Revert "Update Maxim's email address."
This reverts commit d0d87a744d. Oops! This
caused a world rebuild.

Change-Id: I25fff644b2b61d0ee93d69b457b04c72b5b74d15
2025-09-18 12:07:31 +09:00
Maxim Cournoyer
d0d87a744d
Update Maxim's email address.
The change was automated via:

  git grep -l maxim.cournoyer@gmail.com |
    xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'

* .mailmap: New entry.

Change-Id: Iaa88b1e51c94159c49138fb43910badb990eb169
2025-09-18 08:05:19 +09:00
Nicolas Graves
1b3900b317
gnu: python-pycups: Update to 2.0.4.
* gnu/packages/cups.scm (python-pycups): Update to 2.0.4.
[arguments]: Refresh comment.

Change-Id: I411b6478790872d8531a8617e3f3cc46f5a09fe0
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-08-14 13:15:25 +01:00
Nicolas Graves
bff730995a
gnu: python-pycups: Switch to pyproject.
* gnu/packages/cups.scm (python-pycups):
[source]: Switch to git-fetch.
[build-system]: Switch to pyproject-build-system.
[native-inputs]: Add python-setuptools, python-wheel.

Change-Id: I9bd66f866aaade04d97fa2203f6c93ab7def1009
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-08-14 13:15:22 +01:00
Zheng Junjie
7f0ed8d2cb
gnu: hplip: Fix build on gcc 14.
* gnu/packages/cups.scm (hplip)[arguments]<#:phases>: Also Add
-Wno-error=implicit-int to relax gcc-14's strictness.

Change-Id: If1dcaffad3e18c8070656451f3f22960f9eb4c16
2025-07-18 20:17:35 +02:00
Zheng Junjie
03a7e8c362
gnu: cups-minimal: Ungraft.
* gnu/packages/cups.scm (cups-minimal)[replacement]: Remove it.
[source]: Add cups-minimal-Address-PPD-injection-issues.patch.
* gnu/packages/cups.scm (cups-minimal/fixed): Remove it.

Change-Id: Icb5295af42b5a84741a73ed4b662bc8736ab6b2b
2025-07-18 20:17:32 +02:00
Janneke Nieuwenhuizen
e5df1c0831
gnu: epson-inkjet-printer-escpr: Fix build with gcc-14.
* gnu/packages/cups.scm (epson-inkjet-printer-escpr)[arguments]: Add CFLAGS
to #:configure-flags to relax gcc-14's strictness.

Change-Id: I2333252701bc47adfef3da9f40b14c4dbda36abe
2025-07-18 20:17:13 +02:00
Janneke Nieuwenhuizen
fcf21654e4
gnu: hplip: Update to 3.24.4 and fix build with gcc-14.
* gnu/packages/cups.scm (hplip): Update to 3.24.4.
[arguments]: Add "set-gcc-14-cflags" phase to relax gcc-14's strictness.

Change-Id: Ie753c9ebb51f08c4683e9a9762e9c269eceb5e22
2025-07-18 20:17:12 +02:00
Antoine Côté
3f98a9838a
gnu: brlaser: Update to 6.2.7.
Pdewacht repository no longer active, upstream development moved to Owl-Maintain fork.

* gnu/packages/cups.scm (brlaser): Update to 6.2.7.
[source]: Switch to maintained fork.
[home-page]: Update URL.
[description]: Update the list of supported printers.

Change-Id: I4ef2f1837c38ece8bcb0b900214355eb7c833f6f
Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>
2025-07-12 12:54:09 +02:00
Lukas Gradl
36d8ab1c7b
gnu: hplip-minimal: Disable networking.
* gnu/packages/cups.scm (hplip-minimal): Disable networking.
[arguments] <#:configure-flags>: Add "--disable-network-build".  The "lite
build" of hplip is incompatible with the "network build", so disable
the latter explicitly.
[inputs]: Rephrase the inputs as a positive list and remove net-snmp, openssl,
and avahi (inherited from hplip).

Change-Id: I954b665fe5bdeae2a2fab79c1e2cbfa8ac01f58b
Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>
2025-03-30 23:20:35 +02:00
Lukas Gradl
8f6056faf5
gnu: hplip: Enable networking.
* gnu/packages/cups.scm (hplip): Enable networking.
[arguments] <#:configure-flags>: Remove flag "--disable-network-build".
[inputs]: Add net-snmp, openssl, and avahi.

Change-Id: Ibd95a9786c7bea5b45d0fcfa6ab81eca47ca82a0
Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>
2025-03-30 23:20:34 +02:00
Lukas Gradl
a15e3f02e8
gnu: hplip: Update to 3.24.4.
* gnu/packages/cups.scm (hplip): Update to 3.24.4.

Change-Id: Ic9c88ce3a6d4ad7f5b6b85373a1cb12b26cfea9f
Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>
2025-03-30 23:20:31 +02:00
Tobias Geerinckx-Rice
9a141b5bd6
gnu: cups-minimal: Address PPD injection issues [security fixes].
* gnu/packages/cups.scm (cups-minimal)[replacement]: Graft with...
(cups-minimal/fixed): ...this new variable.
[source]: Add a patch to do the thing.
* gnu/packages/patches/cups-minimal-Address-PPD-injection-issues.patch:
New file.

Change-Id: Id4db145887e72081b404dedbccd62c23a8f52d55
2024-09-22 02:00:00 +02:00
Tobias Geerinckx-Rice
198840bcb5
gnu: cups: Update to 2.4.10 [fixes nothitg]
Change-Id: Ic600f96d7cae1d4ecc0f5b1b4561caae317c4048
2024-09-22 02:00:00 +02:00
Tobias Geerinckx-Rice
2ad3b0187b
gnu: cups-minimal: Update to 2.4.9 [fixes CVE-2024-35235].
* gnu/packages/cups.scm (cups-minimal): Update to 2.4.9.

Change-Id: I153a75bccd1950c29d4ef6111321be262494208d
2024-08-31 10:45:47 +02:00
Josselin Poiret
d626b5e387
gnu: cups-minimal: Add libxcrypt dependency.
* gnu/packages/cups.scm (cups-minimal): Add libxcrypt dependency.

Change-Id: Icfd65026d5d8350d694a4268d03096aafa33341f
2024-08-31 10:44:53 +02:00
Maxim Cournoyer
b0ce5d6095
gnu: python-pycups: Update to 2.0.1.
* gnu/packages/cups.scm (python-pycups): Update to 2.0.1.

Change-Id: Iedf57c35c543f1002b5716f972e1bdc676110b75
2024-08-31 10:44:43 +02:00
Maxim Cournoyer
13c4d8d530
gnu: cups-filters: Update to 1.28.16.
* gnu/packages/cups.scm (cups-filters): Update to 1.28.16.
[configure-flags]: Set CFLAGS and CXXFLAGS.
[inputs]: Add libexif.

Change-Id: Ib8a05d27533af0d9e59d72771670373acb300140
2024-08-31 10:44:43 +02:00
Ludovic Courtès
9ebaf6518a
gnu: cups-minimal: Ungraft.
* gnu/packages/cups.scm (cups-minimal): Update to 2.4.7.
[replacement]: Remove.
(cups-minimal/fixed): Remove.

Change-Id: I6359cec26fc5c1fa134c61c76f2fe8581d646ad6
2024-08-31 10:44:13 +02:00
Efraim Flashner
f62d286d55
gnu: cups.scm: Add missing module import.
* gnu/packages/cups.scm: Import (gnu packages bash).
2024-08-31 10:42:32 +02:00
Maxim Cournoyer
b33c4e954a
gnu: foo2zjs: Add bash-minimal to inputs.
* gnu/packages/cups.scm (foo2zjs)
[inputs]: Add bash-minimal.

Change-Id: Ia9d0e303f00490e242bb0f59b2b033636dbf91fa
2024-08-31 10:42:31 +02:00
Maxim Cournoyer
57976f87c7
gnu: cups-filters: Add bash-minimal to inputs.
* gnu/packages/cups.scm (cups-filters)
[inputs]: Add bash-minimal.

Change-Id: Ie6059967d41bbf83fa7d51ea34db269e57b76af5
2024-08-31 10:42:31 +02:00
Maxim Cournoyer
d8088e9b3d
gnu: splix: Import the correct set of modules.
* gnu/packages/cups.scm (splix) [arguments]
<modules>: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Id510a57db2bd6cabb3fcbd0d1dd6c55ed65b6219
2024-08-31 10:42:17 +02:00
Maxim Cournoyer
5a5669482d
gnu: epson-inkjet-printer-escpr: Import the correct set of modules.
* gnu/packages/cups.scm (epson-inkjet-printer-escpr) [arguments]
<modules>: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I1066d14e8000e0edf90f0d66886de0505018efb8
2024-08-31 10:42:17 +02:00
Maxim Cournoyer
f59df1aa3c
build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.
Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.

The renaming was automated via the command:

  $ git grep -l %gnu-build-system-modules
    | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i

* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this.  Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
2024-08-31 10:42:16 +02:00
Maxim Cournoyer
9888810091
gnu: cups-filters: Sort inputs.
* gnu/packages/cups.scm (cups-filters) [inputs]: Sort.

Change-Id: I0c9527ae72bc569030aa49a2f003e0061e3af20b
2024-08-31 10:42:03 +02:00
Emmanuel Beffara
a51507e582
gnu: cups-filters: Add coreutils and sed to wrapped PATH.
* gnu/packages/cups.scm (cups-filters) [arguments]: Add coreutils and sed to
PATH in wrap-filters phase.
[inputs]: Add coreutils and sed.

Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2024-08-31 10:42:03 +02:00
Tobias Geerinckx-Rice
0c90851837
gnu: cups-minimal: Update graft to 2.4.9 [fixes CVE-2024-35235].
* gnu/packages/cups.scm (cups-minimal/fixed): Update to 2.4.9.

Change-Id: Ibb3c371b0e90457736b396f5e97b3055a4c7fc97
2024-08-18 02:00:00 +02:00
Tobias Geerinckx-Rice
392de3262e
gnu: hplip: Update to 3.23.12.
* gnu/packages/cups.scm (hplip): Update to 3.23.12.

Change-Id: If27e2cfcd0b4e3667ba399569a24df976d6aa41d
2023-11-19 01:00:00 +01:00
Tobias Geerinckx-Rice
3a0440c3f9
gnu: cups-minimal/fixed: Update to 2.4.7.
* gnu/packages/cups.scm (cups-minimal/fixed): Update to 2.4.7.

Change-Id: I47b34356c53715462e1750e1b639b9768f2c3287
2023-11-19 01:00:00 +01:00
Zheng Junjie
2337666833
gnu: cups: Fix cross-compiling.
* gnu/packages/cups.scm (cups-filters)[native-inputs]: When cross-compiling
add cups-minimal.
(cups-minimal)[native-inputs]: When cross-compiling add this-package.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Change-Id: Ifcc34f09d0a5afb3a1b95be51715c509b8ef5ed4
2023-10-26 11:30:01 +02:00
Bruno Victal
1e5ec9d853
gnu: hplip: Fix USB timeouts.
* gnu/packages/patches/hplip-usb-timeout.patch: New file.
* gnu/local.mk: Register it.
* gnu/packages/cups.scm (hplip): Use it.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2023-10-25 11:59:58 +02:00
Tobias Geerinckx-Rice
4a8c51c7be
gnu: hplip: Update to 3.23.8.
* gnu/packages/cups.scm (hplip): Update to 3.23.8.
2023-09-24 02:00:00 +02:00
Tobias Geerinckx-Rice
2a1c1a108d
gnu: epson-inkjet-printer-escpr: Document missing newer tarballs.
* gnu/packages/cups.scm (epson-inkjet-printer-escpr)[source]:
Add more bad news to comment.
2023-07-16 02:00:14 +02:00
Tobias Geerinckx-Rice
57fe5b2338
gnu: hplip: Update to 3.23.5.
* gnu/packages/cups.scm (hplip): Update to 3.23.5.
2023-07-16 02:00:13 +02:00
Tobias Geerinckx-Rice
c354a8f15f
gnu: brlaser: Use G-expressions.
* gnu/packages/cups.scm (brlaser)[arguments]:
Rewrite as G-expressions.
2023-07-02 02:00:41 +02:00
Tobias Geerinckx-Rice
9e9cb01020
gnu: brlaser: Update to 6-2.2a49e32.
* gnu/packages/cups.scm (brlaser): Update to 6-2.2a49e32.
2023-07-02 02:00:40 +02:00
Efraim Flashner
241c8da50d
gnu: cups: Don't set #:tests? to #:true.
* gnu/packages/cups.scm (cups)[arguments]: Rewrite to strip the #:tests?
argument from the inherited package.
2023-07-09 10:43:03 +03:00
Tobias Geerinckx-Rice
2986ba899f
gnu: cups: Replace with 2.4.6 [fixes CVE-2023-34241].
* gnu/packages/cups.scm (cups-minimal/fixed): New variable.
(cups-minimal)[replacement]: Assign it to new field.
2023-07-02 02:00:08 +02:00
Maxim Cournoyer
ebf85c3c39
gnu: hplip: Update to 3.23.3.
* gnu/packages/cups.scm (hplip): Update to 3.23.3.
[arguments]: Remove the fix-build-with-python-3.8 phase.
2023-04-14 23:37:07 -04:00
Maxim Cournoyer
d8de115d35
gnu: hplip: Remove input labels.
* gnu/packages/cups.scm (hplip) [inputs]: Remove input labels.
2023-04-14 23:37:07 -04:00
Maxim Cournoyer
298d0d381e
gnu: hplip: Use gexps.
* gnu/packages/cups.scm (hplip) [arguments]: Use gexps.
* gnu/packages/cups.scm (hplip-minimal): Likewise.
2023-04-14 23:37:06 -04:00
Maxim Cournoyer
da923bc122
gnu: hplip: Re-order fields.
* gnu/packages/cups.scm (hplip): Re-order fields.
2023-04-14 23:37:06 -04:00
Maxim Cournoyer
2a97bf3c50
gnu: hplip: Update to 3.22.10.
* gnu/packages/cups.scm (hplip): Update to 3.22.10.
[arguments]: Absorb the fix-more-hard-coded-file-names phase from hplip-next
into the fix-hard-coded-file-names phase.
(hplip-next): Delete variable.
2023-04-14 23:37:06 -04:00
Maxim Cournoyer
f14aa6d0a3
gnu: cups-minimal: Add config to native inputs unconditionally.
* gnu/packages/cups.scm (cups-minimal) [native-inputs]: Always add config.
2023-04-14 20:41:18 -04:00