summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZheng Junjie <z572@z572.online>2025-05-08 22:59:59 +0800
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:32 +0200
commit03a7e8c3628bd877064c31323ee9175bc17a925c (patch)
treeb7d1c2bebda61efe44968bc89a3e93cdeaf55087
parent3d0160354d2cc9e0ac7ac4450ba53a8b00b2703f (diff)
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
-rw-r--r--gnu/packages/cups.scm13
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 571708f43a..b54c1cb09d 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -320,7 +320,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)
@@ -330,7 +329,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
@@ -410,15 +410,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")