diff mbox series

[bug#78337,v2,4/6] gnu: cups-minimal: Ungraft.

Message ID b5e15fcd2766a95c8bd3175897b5cb5eb50b2d6e.1747709896.git.maxim.cournoyer@gmail.com
State New
Headers
Series [bug#78337,v2,1/6] gnu: curl: Ungraft. |

Commit Message

Maxim Cournoyer May 20, 2025, 2:58 a.m. UTC 
  From: Zheng Junjie <z572@z572.online>

* 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
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/cups.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 41c3f0af45..847fc29a9a 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -265,7 +265,6 @@  (define-public cups-minimal
   (package
     (name "cups-minimal")
     (version "2.4.9")
-    (replacement cups-minimal/fixed)
     (source
      (origin
        (method git-fetch)
@@ -275,7 +274,8 @@  (define-public cups-minimal
        ;; 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
@@ -355,15 +355,6 @@  (define-public cups-minimal
     ;; 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")