[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: Remove gpgme-1.18 and qgpgme-1.18.
From: |
guix-commits |
Subject: |
05/06: gnu: Remove gpgme-1.18 and qgpgme-1.18. |
Date: |
Fri, 31 Mar 2023 10:57:15 -0400 (EDT) |
glv pushed a commit to branch core-updates
in repository guix.
commit 7f7532a847f1232fa8797a5d6d6b2a7e34278854
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Thu Mar 30 23:48:17 2023 +0200
gnu: Remove gpgme-1.18 and qgpgme-1.18.
* gnu/packages/gnupg.scm (gpgme-1.18, qgpgme-1.18): Remove variables.
* gnu/packages/kde-pim.sm (kleopatra, kmail): Refer to gpgme and qgpgme
instead.
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
gnu/packages/gnupg.scm | 23 -----------------------
gnu/packages/kde-pim.scm | 8 ++++----
2 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 42013f1b94..49d29ed9bd 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -416,19 +416,6 @@ and every application benefits from this.")
(properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/gpgme")))))
-;; TODO: Merge with gpgme in the next rebuild cycle.
-(define-public gpgme-1.18
- (package
- (inherit gpgme)
- (version "1.18.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnupg/gpgme/gpgme-"
- version ".tar.bz2"))
- (sha256
- (base32
- "17hfigfnq6xz45b5xrp299f68b5mwx0aysd51sx5v4nf8yp4w79n"))))))
-
(define-public qgpgme
(package
(inherit gpgme)
@@ -457,16 +444,6 @@ QGpgME was originally developed as part of libkleo and
incorporated into
gpgpme starting with version 1.7.")
(license license:gpl2+))) ;; Note: this differs from gpgme
-;; TODO: Merge with qgpgme in the next rebuild cycle.
-(define-public qgpgme-1.18
- (package
- (inherit qgpgme)
- (version (package-version gpgme-1.18))
- (source (package-source gpgme-1.18))
- (inputs
- (modify-inputs (package-inputs qgpgme)
- (replace "gpgme" gpgme-1.18)))))
-
(define-public guile-gcrypt
(package
(name "guile-gcrypt")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 19066fd289..6f3cbf2999 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1139,7 +1139,7 @@ protocol for querying and modifying directory services
running over TCP/IP.")
kdoctools))
(inputs
(list boost
- gpgme-1.18
+ gpgme
kcmutils
kcodecs
kconfig
@@ -1159,7 +1159,7 @@ protocol for querying and modifying directory services
running over TCP/IP.")
libassuan
libkleo
breeze-icons ;; default icon set
- qgpgme-1.18
+ qgpgme
qtbase-5))
(arguments
`(#:phases
@@ -1196,7 +1196,7 @@ and retrieving certificates from LDAP servers.")
akonadi-mime
akonadi-search
boost
- gpgme-1.18
+ gpgme
grantlee
grantleetheme
kbookmarks
@@ -1243,7 +1243,7 @@ and retrieving certificates from LDAP servers.")
libkleo
libksieve
breeze-icons ; default icon set, required for tests
- qgpgme-1.18
+ qgpgme
qtbase-5
qtdeclarative-5
qtkeychain
- branch core-updates updated (3b57a9cac8 -> cebcf3533a), guix-commits, 2023/03/31
- 01/06: gnu: Replace all uses of atk by at-spi2-core., guix-commits, 2023/03/31
- 03/06: gnu: atk: Deprecate in favor of at-spi2-core., guix-commits, 2023/03/31
- 05/06: gnu: Remove gpgme-1.18 and qgpgme-1.18.,
guix-commits <=
- 02/06: gnu: atkmm: Update to 2.36.2., guix-commits, 2023/03/31
- 06/06: gnu: zsh: Patch failing test that uses egrep., guix-commits, 2023/03/31
- 04/06: gnu: gpgme: Propagate libassuan., guix-commits, 2023/03/31