diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-05-17 15:07:50 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-05-17 15:16:59 +0200 |
| commit | 2f2102070e5c8c5182f737b06b6fe409780401b6 (patch) | |
| tree | b396b8910ced479d6c78f4ab4c32da30c6e04bd1 | |
| parent | eb02ba2d630779c20946bda212be23c714b7ac34 (diff) | |
| download | guix-patches-2f2102070e5c8c5182f737b06b6fe409780401b6.tar guix-patches-2f2102070e5c8c5182f737b06b6fe409780401b6.tar.gz | |
gnu: cups, cups-minimal: Ungraft 2.3.3.
* gnu/packages/cups.scm (cups-minimal): Update to 2.3.3.
(cups-minimal, cups)[replacement]: Remove.
(cups-minimal-2.3.3, cups-2.3.3): Remove variables.
| -rw-r--r-- | gnu/packages/cups.scm | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index f668d6c19b..b9a92dc609 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -187,9 +187,8 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") ;; satisfy this dependency. (define-public cups-minimal (package - (replacement cups-minimal-2.3.3) (name "cups-minimal") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) @@ -197,7 +196,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv")))) + "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -250,22 +249,8 @@ device-specific programs to convert and print many types of files.") ;; CUPS is Apache 2.0 with exceptions, see the NOTICE file. (license license:asl2.0))) -(define-public cups-minimal-2.3.3 - (package - (inherit cups-minimal) - (version "2.3.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/apple/cups/releases/download/v" - version "/cups-" version "-source.tar.gz")) - (sha256 - (base32 - "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))))) - (define-public cups (package (inherit cups-minimal) - (replacement cups-2.3.3) (name "cups") (arguments `(;; Three tests fail: @@ -407,12 +392,6 @@ device-specific programs to convert and print many types of files.") ("cups-filters" ,cups-filters) ("zlib" ,zlib))))) -(define-public cups-2.3.3 - (package - (inherit cups) - (version "2.3.3") - (source (package-source cups-minimal-2.3.3)))) - (define-public cups-pk-helper (package (name "cups-pk-helper") |