andreas pushed a commit to branch core-packages-team
in repository guix.
commit 9a7b32aae7f238b9430ac6c5df27815629cb6264
Author: Zheng Junjie <[email protected]>
AuthorDate: Thu May 8 22:59:59 2025 +0800
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
---
gnu/packages/cups.scm | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 5eb45b97b5..2ef1a56b2f 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -266,7 +266,6 @@ filters for the PDF-centric printing workflow introduced by
OpenPrinting.")
(package
(name "cups-minimal")
(version "2.4.9")
- (replacement cups-minimal/fixed)
(source
(origin
(method git-fetch)
@@ -276,7 +275,8 @@ filters for the PDF-centric printing workflow introduced by
OpenPrinting.")
;; Avoid NAME confusion: these are the complete CUPS sources.
(file-name (git-file-name "cups" version))
(sha256
- (base32 "08wjd1flyaslhnwvxl39403qi3g675rk532ysiyk6cda4r8ks1g1"))))
+ (base32 "08wjd1flyaslhnwvxl39403qi3g675rk532ysiyk6cda4r8ks1g1"))
+ (patches (search-patches
"cups-minimal-Address-PPD-injection-issues.patch"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -356,15 +356,6 @@ applications''. These must be installed separately.")
;; CUPS is Apache 2.0 with exceptions, see the NOTICE file.
(license license:asl2.0)))
-(define cups-minimal/fixed
- (package
- (inherit cups-minimal)
- (source
- (origin
- (inherit (package-source cups-minimal))
- (patches
- (search-patches "cups-minimal-Address-PPD-injection-issues.patch"))))))
-
(define-public cups
(package/inherit cups-minimal
(name "cups")
