civodul pushed a commit to branch core-updates
in repository guix.
commit 3200be36a46f84b7b9c1975c27471d641fc81302
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Dec 20 16:55:09 2023 +0100
gnu: cups-minimal: Ungraft.
* gnu/packages/cups.scm (cups-minimal): Update to 2.4.7.
[replacement]: Remove.
(cups-minimal/fixed): Remove.
Change-Id: I6359cec26fc5c1fa134c61c76f2fe8581d646ad6
---
gnu/packages/cups.scm | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index d5eacd2442..12d9f9102c 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2019, 2021 Ricardo Wurmus <[email protected]>
-;;; Copyright © 2015, 2016, 2017, 2019, 2021 Ludovic Courtès <[email protected]>
+;;; Copyright © 2015, 2016, 2017, 2019, 2021, 2023 Ludovic Courtès
<[email protected]>
;;; Copyright © 2015-2018, 2023 Efraim Flashner <[email protected]>
;;; Copyright © 2016 Danny Milosavljevic <[email protected]>
;;; Copyright © 2017 Leo Famulari <[email protected]>
@@ -255,8 +255,7 @@ filters for the PDF-centric printing workflow introduced by
OpenPrinting.")
(define-public cups-minimal
(package
(name "cups-minimal")
- (version "2.4.2")
- (replacement cups-minimal/fixed)
+ (version "2.4.7")
(source
(origin
(method git-fetch)
@@ -266,7 +265,7 @@ 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 "01nn6ij7kpf2vzikinn7mk4crjx4ab8m4pplvsccc8gg30a2q9y9"))))
+ (base32 "0cj3gs7ki9v0drj19l326s8f1kxrpq7jkzrdfdk7ykrlk7sj645f"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
@@ -346,20 +345,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)
- (version "2.4.7")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/OpenPrinting/cups";)
- (commit (string-append "v" version))))
- (file-name (git-file-name "cups" version))
- (sha256
- (base32 "0cj3gs7ki9v0drj19l326s8f1kxrpq7jkzrdfdk7ykrlk7sj645f"))))))
-
(define-public cups
(package/inherit cups-minimal
(name "cups")
