1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-07-07 04:44:06 +02:00

Compare commits

...

28 Commits

Author SHA1 Message Date
Cayetano Santos 1e00840ab4 gnu: gpgmepp: Update to 2.1.0.
* gnu/packages/gnupg.scm (gpgmepp): Update to 2.1.0.

Change-Id: Ie733cff10648bd7e09cadc9dc1e5577ee19f99c8
2026-05-29 10:47:18 +02:00
Cayetano Santos f9a5195bf4 gnu: libassuan: Update to 3.0.2.
* gnu/packages/gnupg.scm (libassuan): Update to 3.0.2.

Change-Id: Ie9116581fc2f7a2adf6fe27f473b629ebd171192
2026-05-29 10:47:18 +02:00
Cayetano Santos 500ceb4352 gnu: qgpgme: Update to 2.1.0.
* gnu/packages/gnupg.scm (qgpgme): Update to 2.1.0.

Change-Id: Idf7de4452f96f6d32d7e2bb7f2a88bc6e7b16c2f
2026-05-29 10:47:18 +02:00
Cayetano Santos d6cfaecd11 gnu: gpgme-2: Update to 2.1.0.
* gnu/packages/gnupg.scm (gpgme-2): Update to 2.1.0.

Change-Id: I0554efc320ec66bbe1393ee83d0387c80412743b
2026-05-29 10:47:18 +02:00
Cayetano Santos 7c0268900e gnu: libksba: Update to 1.8.0.
* gnu/packages/gnupg.scm (libksba): Update to 1.8.0.

Change-Id: I8edb8c70b573ba26e83858f08aa953df9acc0414
2026-05-29 10:47:18 +02:00
Yelninei db51427479 gnu: gnutls: Update to 3.8.13.
* gnu/packages/tls.scm (gnutls): Update to 3.8.13.
[source]: Remove gnutls-no-which.patch.
* gnu/packages/patches/gnutls-no-which.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Deregister it.

Merges guix/guix!7306

Change-Id: I4161600203490b2989dfddafbedebfeead1cbfea
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:18 +02:00
Yelninei 952d84dc7d gnu: p11-kit: Update to 0.26.2.
* gnu/packages/tls.scm (p11-kit): Update to 0.26.2.

Merges guix/guix!7306

Change-Id: If3a055f532e99fd4e4d433a23e781a147d1af791
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:18 +02:00
Yelninei e97d8ee352 gnu: libidn2: Update to 2.3.8.
* gnu/packages/libidn.scm (libidn2): Update to 2.3.8.

Merges guix/guix!7306

Change-Id: Ib2b3bcc340cbf89cfb1fc67e14eb45ad09910b08
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:18 +02:00
Sughosha eb60784b22 gnu: python-gpg: Update to 2.0.0.
* gnu/packages/gnupg.scm (python-gpg): Update to 2.0.0.
[source]<patches>: Remove the patch.
[arguments]<#:phases>: Remove 'set-environment phase.  Add 'patch-setup.py
phase.
[inputs]: Remove gpgme; add gpgme-2 and libgpg-error.
* gnu/packages/patches/python-gpg-setup-72.patch: Remove file.
* gnu/local.mk: Deregister it.

Fixes: guix/guix#2807
Merges guix/guix!8544

Change-Id: Ie926eed78500880420238272d42beb32333e5de7
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:18 +02:00
Sughosha bd775220cb gnu: isoimagewriter: Build with newer gpgme.
* gnu/packages/kde-utils.scm (isoimagewriter)[inputs]: Remove gpgme; add
gpgme-2.

Merges guix/guix!8544

Change-Id: I790c8814429b04eb2c06d51f4ff6fbd9e1eed42d
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:18 +02:00
Sughosha ae142f80df gnu: kmail: Fix build.
* gnu/packages/kde-pim.scm (kmail)[inputs]: Remove gpgme; add gpgme-2.

Merges guix/guix!8544

Change-Id: Id01fc550b3aa86dac43895cc1ec99184cb6379f8
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:18 +02:00
Sughosha a1d66a202c gnu: kaddressbook: Build with newer gpgme.
* gnu/packages/kde-pim.scm (kaddressbook)[inputs]: Remove gpgme; add
gpgme-2.

Merges guix/guix!8544

Change-Id: I136cbbc6b99bdf9b80402ba14fbb33e3d3a32e30
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:18 +02:00
Sughosha 63df36aebf gnu: kmailcommon: Fix build.
* gnu/packages/kde-pim.scm (kmailcommon)[inputs]: Remove gpgme; add gpgme-2.

Merges guix/guix!8544

Change-Id: Ide500e2627ff88d83284581c0c6e882661ba9d9c
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha d7e76c1907 gnu: akregator: Fix build.
* gnu/packages/kde-pim.scm (akregator)[inputs]: Remove gpgme; add
gpgme-2.

Merges guix/guix!8544

Change-Id: I8a927f28ab8101752737ce23903d0159a2108859
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha b8a5292a9e gnu: kleopatra: Fix build.
* gnu/packages/kde-pim.scm (kleopatra)[inputs]: Remove gpgme; add gpgme-2.

Merges guix/guix!8544

Change-Id: I658d2ef2d0855888d8188c50234dcc7feb0a80c5
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha e01b095fe6 gnu: kmessagelib: Fix build.
* gnu/packages/kde-pim.scm (kmessagelib)[inputs]: Remove gpgme; add
gpgme-2.

Merges guix/guix!8544

Change-Id: I4f9759ee18a0c54ddf5084fe3b9d778e59ae0c9c
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha 610c17e72c gnu: libkleo: Fix build.
* gnu/packages/kde-pim.scm (libkleo)[inputs]: Remove gpgme; add gpgme-2.
[propagated-inputs]: Ditto.

Merges guix/guix!8544

Change-Id: I149561985a6b881adfead477feac70f8a1158ad2
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha 1ea42353fc gnu: kwallet-5: Build with newer gpgme.
* gnu/packages/kde-frameworks.scm (kwallet-5)[inputs]: Remove gpgme; add
gpgme-2.

Merges guix/guix!8544

Change-Id: I753a517649011858d49d3b4b685e7e62c847975b
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha 5eccc921d8 gnu: kwallet: Build with newer gpgme.
* gnu/packages/kde-frameworks.scm (kwallet)[inputs]: Remove gpgme; add
gpgme-2.

Merges guix/guix!8544

Change-Id: I06b46d0add86c1e7cf7bcc9032e326f88ae0b486
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha 4ff550c126 gnu: qgpgme: Update to 2.0.0.
QGpgME has been separated from GPGME.

* gnu/packages/gnupg.scm (qgpgme): Update to 2.0.0; do not inherit from gpgme;
remove the comment for the license field.
[version]: New field; update to "2.0.0".
[source]: New field;  update to the new location.
[build-system]: New field; switch to qt-build-system.
[arguments]: Switch to gexp.
<#:qtbase>: Set to qtbase.
<#:phases>: Remove 'chdir-and-symlink phase; add 'check-setup phase.
[propagated-inputs]: Remove gpgme; add gpgme-2, gpgmepp, and libgpg-error.
[native-inputs]: Do not modify the inherited native inputs; add gnupg and
pkg-config.
[inputs]: Remove field.
[home-page]: New field; update URL.

Merges guix/guix!8544

Change-Id: Ibd0119521c119d5426692cf20970d844361b7fe1
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha e1e8dcec2d gnu: qgpgme-qt5: Update to 2.0.0.
QGpgME has been separated from GPGME.

* gnu/packages/gnupg.scm (qgpgme): Update to 2.0.0; do not inherit from gpgme;
remove the comment for the license field.
[version]: New field; update to "2.0.0".
[source]: New field;  update to the new location.
[build-system]: New field; switch to qt-build-system.
[arguments]: Switch to gexp.
<#:phases>: Remove 'chdir-and-symlink phase; add 'check-setup phase.
[propagated-inputs]: Remove gpgme; add gpgme-2, gpgmepp, and libgpg-error.
[native-inputs]: Do not modify the inherited native inputs; add gnupg and
pkg-config.
[inputs]: Remove field.
[home-page]: New field; update URL.

Merges guix/guix!8544

Change-Id: I8a3ee2037be44339510a3ad82766a3a995d34746
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha dd2ffbae41 gnu: Add gpgmepp.
* gnu/packages/gnupg.scm (gpgmepp): New variable.

Merges guix/guix!8544

Change-Id: I3de7f992aa2fd99926dcdf40ab425b8f2d3c604a
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha 832aa7fe08 gnu: gpgme-1: Inherit from gpgme-2.
* gnu/packages/gnupg.scm (gpgme-1): Inherit from gpgme-2.
[build-system, arguments, inputs, propagated-inputs, home-page, synopsis,
description, license]: Drop the fields.

Merges guix/guix!8544

Change-Id: Iaefeea413e7a6136c4808ba2b9d9db8909ad7680
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha 3af43f1496 gnu: Add gpgme-2.
* gnu/packages/gnupg.scm (gpgme-2): New variable.

Merges guix/guix!8544

Change-Id: Ie2f31a44521d96c8c44507ba31b9468989c793ad
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Sughosha 7a997cedcf gnu: gpgme: Rename to gpgme-1.
* gnu/packages/gnupg.scm (gpgme): Raname variable to...
(gpgme-1): ...this.
(gpgme): New variable set to gpgme-1.

Merges guix/guix!8544

Change-Id: I428f60548e56b59d29d1abdf4f546e37353a70b3
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Ahmad Jarara 7c91facc51 gnu: libfido2: Enable tests.
* gnu/packages/security-token.scm (libfido2): Enable tests.
[arguments]<#:tests?>: Unset #f.
<#:configure-flags>: Add "-DBUILD_TESTS=ON".

Merges guix/guix!8743

Change-Id: Id262d0577653408b3827b6ab6ccecb689dabb306
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
Modified-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Ahmad Jarara f688d7f551 gnu: libcbor: Enable tests.
* gnu/packages/compression.scm (libcbor):
[arguments]: Switch to G-Expressions.
<#:tests?>: Unset #f.
<#:configure-flags>: Remove redundant CMAKE_BUILD_TYPE,
CMAKE_INSTALL_LIBDIR, and CMAKE_INSTALL_RPATH configure flags.
Remove CBOR_CUSTOM_ALLOC flag; add "-DWITH_TESTS=ON".
[inputs]: Add cmocka.

Merges guix/guix!8743

Change-Id: I673c2d44a1533424e201c14a3becbb80065d870e
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
Modified-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
Yelninei 86e99fd53d gnu: rhash: Update to 1.4.6.
* gnu/packages/crypto.scm (rhash): Update to 1.4.6.

Merges guix/guix!7667

Change-Id: Ibc4d1d1ceffe8895fe75644482b4cbc2542d3d48
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-05-29 10:47:17 +02:00
12 changed files with 136 additions and 200 deletions
-2
View File
@@ -1527,7 +1527,6 @@ dist_patch_DATA = \
%D%/packages/patches/gnumach-version.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
%D%/packages/patches/gnutls-no-which.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
@@ -2117,7 +2116,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-clarabel-blas.patch \
%D%/packages/patches/python-daemon-relax-lockfile.patch \
%D%/packages/patches/python-docrepr-fix-tests.patch \
%D%/packages/patches/python-gpg-setup-72.patch \
%D%/packages/patches/python-hdmedians-replace-nose.patch \
%D%/packages/patches/python-jinja2-fragments-modify-conftest-py.patch \
%D%/packages/patches/python-louvain-fix-test.patch \
+7 -11
View File
@@ -34,7 +34,7 @@
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021, 2024-2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2021 Ahmad Jarara <git@ajarara.io>
;;; Copyright © 2021, 2026 Ahmad Jarara <ajarara@fastmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@@ -3005,17 +3005,13 @@ can append files to the end of such compressed archives.")
"00ibddiy62kbs9wl52c35j0hbqanx6pi7lvzkpzmbsizkj8mhp1p"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f
#:configure-flags
(let* ((out (assoc-ref %outputs "out"))
(lib (string-append out "/lib")))
(list
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_SHARED_LIBS=ON"
"-DCBOR_CUSTOM_ALLOC=ON"
(string-append "-DCMAKE_INSTALL_LIBDIR=" lib)
(string-append "-DCMAKE_INSTALL_RPATH=" lib)))))
(list
#:configure-flags
#~'("-DWITH_TESTS=ON"
"-DBUILD_SHARED_LIBS=ON")))
(synopsis "The C library for parsing and generating CBOR")
(native-inputs
(list cmocka))
(description
"@acronym{CBOR, The Concise Binary Object Representation} is a data format
whose design goals include the possibility of extremely small code size, fairly
+2 -2
View File
@@ -1009,7 +1009,7 @@ SHA-1, SHA-2, and SHA-3, yet is at least as secure as SHA-3.")
(define-public rhash
(package
(name "rhash")
(version "1.4.3")
(version "1.4.6")
(source
(origin
(method url-fetch)
@@ -1018,7 +1018,7 @@ SHA-1, SHA-2, and SHA-3, yet is at least as secure as SHA-3.")
(file-name (string-append "rhash-" version ".tar.gz"))
(sha256
(base32
"0glaghjvwh9ziiqf599v0fdr6jrgc7lcnriq0h7r41k3jrkglh0y"))))
"0ylkxhkj4nzmb0iampn2lv7v4yw59x7dl8mdcxqcx2mfxv7ijq4z"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
+107 -49
View File
@@ -27,6 +27,7 @@
;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -82,6 +83,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
@@ -237,7 +239,7 @@ generation.")
(define-public libassuan
(package
(name "libassuan")
(version "3.0.1")
(version "3.0.2")
(source
(origin
(method url-fetch)
@@ -245,7 +247,7 @@ generation.")
version ".tar.bz2"))
(sha256
(base32
"1ccly6aqyxv3hgshhls6qw177salcrawp0x4lsqs9ph3c4pg9w68"))))
"1xin9h3vhx94j5w9p7xi3csmw1a6yfif2w4r1x8k7rk6sbd1r4yj"))))
(build-system gnu-build-system)
(arguments (if (%current-target-system)
(list #:configure-flags
@@ -267,7 +269,7 @@ provided.")
(define-public libksba
(package
(name "libksba")
(version "1.6.7")
(version "1.8.0")
(source
(origin
(method url-fetch)
@@ -276,7 +278,7 @@ provided.")
version ".tar.bz2"))
(sha256
(base32
"0qxpmadxggx5808326i9g4ya0xrnv14mfxpg7rlvckmviq5m2wng"))))
"14lj3ld4nxf916kq01z0203x36nhgymxf0j222mg4jap16wrssr9"))))
(build-system gnu-build-system)
(propagated-inputs
(list libgpg-error))
@@ -434,16 +436,16 @@ libskba (working with X.509 certificates and CMS data).")
(substitute* "checks/Makefile.in"
(("/bin/sh") (which "sh"))))))))))
(define-public gpgme
(define-public gpgme-2
(package
(name "gpgme")
(version "1.24.1")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2"))
(sha256
(base32 "0px87fbp90xp8vf1wms02flk14zmrqsfr135f5his1kiiqjx01ga"))))
(base32 "0azrddb51c423il7xdqcrahvi8fyhblvvs7hzgs5jqn27yjmw744"))))
(build-system gnu-build-system)
(arguments
(list
@@ -455,7 +457,7 @@ libskba (working with X.509 certificates and CMS data).")
(propagated-inputs
;; As required by the pkg-config's Requires.private.
(list libgpg-error libassuan))
(home-page "https://www.gnupg.org/related_software/gpgme/")
(home-page "https://gnupg.org/software/gpgme/index.html")
(synopsis "Library providing simplified access to GnuPG functionality")
(description
"GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -469,57 +471,107 @@ instead. This way bug fixes or improvements can be done at a central place
and every application benefits from this.")
(license license:lgpl2.1+)))
(define-public gpgme-1
(package
(inherit gpgme-2)
(version "1.24.1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2"))
(sha256
(base32 "0px87fbp90xp8vf1wms02flk14zmrqsfr135f5his1kiiqjx01ga"))))))
(define-public gpgme gpgme-1)
(define-public gpgmepp
(package
(name "gpgmepp")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gpgmepp/gpgmepp-" version ".tar.xz"))
(sha256
(base32 "1qhn583cbi67694m3bg77ckb892in2f16src2x5m0102ix309y2p"))))
(build-system cmake-build-system)
(arguments
(list
;; FIXME: BUILD_TESTING variable is enabled by deault, but still no tests
;; are found.
#:tests? #f))
(propagated-inputs
;; As required by the pkg-config's Requires.private.
(list gpgme-2 libgpg-error))
(home-page "https://gnupg.org/software/gpgme/index.html")
(synopsis "C++ bindings/wrapper for GPGME")
(description
"GPGME++ is a C++ wrapper (or C++ bindings) for the GnuPG project's
@acronym{GPGME, GnuPG Made Easy} library.")
(license license:lgpl2.1+)))
(define-public qgpgme-qt5
(package
(inherit gpgme)
(name "qgpgme-qt5")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnupg/qgpgme/qgpgme-" version ".tar.xz"))
(sha256
(base32 "1bb198dk49bd7yx4cf4w07acjhllilx1nczdna7139ncflj5nr0m"))))
(build-system qt-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'chdir-and-symlink
(lambda* (#:key inputs #:allow-other-keys)
(let ((gpgme (assoc-ref inputs "gpgme")))
(symlink (string-append gpgme "/lib/libgpgmepp.la")
"lang/cpp/src/libgpgmepp.la")
(symlink (string-append gpgme "/lib/libgpgme.la")
"src/libgpgme.la"))
(chdir "lang/qt"))))))
(propagated-inputs (list gpgme)) ;required by QGpgmeConfig.cmake
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _
(setenv "HOME" (getcwd))
(invoke "gpg-agent" "--daemon"))))))
(propagated-inputs
(list gpgme-2 ;for FindGpgme.cmake and QGpgmeQt6Config.cmake
gpgmepp ;for QGpgmeQt6Config.cmake
libgpg-error)) ;for FindLibGpgError.cmake and QGpgmeQt6Config.cmake
(native-inputs
(modify-inputs native-inputs
(prepend pkg-config)))
(inputs
(modify-inputs inputs
(prepend qtbase-5)))
(list gnupg ;for tests
pkg-config))
(home-page "https://gnupg.org/software/gpgme/index.html")
(synopsis "Qt API bindings for gpgme")
(description "QGpgme provides a very high level Qt API around GpgMEpp.
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
(license license:gpl2+)))
(define-public qgpgme
(package
(inherit gpgme)
(name "qgpgme")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnupg/qgpgme/qgpgme-" version ".tar.xz"))
(sha256
(base32 "024gdw8i5ibmq0bjjf6znhxw93chh1j21dr25m0gk9z4xsrzwcjv"))))
(build-system qt-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'build 'chdir-and-symlink
(lambda* (#:key inputs #:allow-other-keys)
(let ((gpgme (assoc-ref inputs "gpgme")))
(symlink (string-append gpgme "/lib/libgpgmepp.la")
"lang/cpp/src/libgpgmepp.la")
(symlink (string-append gpgme "/lib/libgpgme.la")
"src/libgpgme.la"))
(chdir "lang/qt"))))))
(propagated-inputs (list gpgme)) ;required by QGpgmeConfig.cmake
(list
#:qtbase qtbase
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _
(setenv "HOME" (getcwd))
(invoke "gpg-agent" "--daemon"))))))
(propagated-inputs
(list gpgme-2 ;for FindGpgme.cmake and QGpgmeQt6Config.cmake
gpgmepp ;for QGpgmeQt6Config.cmake
libgpg-error)) ;for FindLibGpgError.cmake and QGpgmeQt6Config.cmake
(native-inputs
(modify-inputs native-inputs
(prepend pkg-config)))
(inputs
(modify-inputs inputs
(prepend qtbase)))
(list gnupg ;for tests
pkg-config))
(home-page "https://gnupg.org/software/gpgme/index.html")
(synopsis "Qt API bindings for gpgme")
(description "QGpgme provides a very high level Qt API around GpgMEpp.")
(license license:gpl2+)))
@@ -583,21 +635,20 @@ interface (FFI) of Guile.")
(define-public python-gpg
(package
(name "python-gpg")
(version "1.10.0")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "gpg" version))
(patches (search-patches "python-gpg-setup-72.patch"))
(sha256
(base32
"1ji3ynhp36m1ccx7bmaq75dhij9frpn19v9mpi4aajn8csl194il"))))
"0f2l0iyc8gp49i604c5wpliaa1dsyj0i0p9xc9zfj4z7fwaavdsf"))))
(build-system pyproject-build-system)
(arguments
(list
#:tests? #f ; No test suite.
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-environment
(add-before 'build 'patch-setup.py
(lambda _
;; GPGME is built with large file support, so we need to set
;; _FILE_OFFSET_BITS to 64 in all users of the GPGME library.
@@ -607,9 +658,16 @@ interface (FFI) of Guile.")
"extra_macros = { \"_FILE_OFFSET_BITS\": 64 }")))
#~())
(substitute* "setup.py"
(("cc") (which "gcc"))))))))
(("cc") (which "gcc"))
(("\\/usr\\/lib\\/x86_64-linux-gnu( -lgpg-error)" _ keep)
(string-append #$(this-package-input "libgpg-error") "/lib"
keep))
(("\\/usr\\/lib\\/x86_64-linux-gnu( -lgpgme)" _ keep)
(string-append #$(this-package-input "gpgme") "/lib" keep))
(("\\/usr\\/local(', 'include', 'gpgme\\.h')" _ keep)
(string-append #$(this-package-input "gpgme") keep))))))))
(inputs
(list gpgme))
(list gpgme-2 libgpg-error))
(native-inputs
(list swig-4.0 python-setuptools))
(home-page (package-home-page gpgme))
+2 -2
View File
@@ -4540,7 +4540,7 @@ to separate the structure of documents from the data they contain.")
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
(inputs
(list gpgme
(list gpgme-2
kauth
kcodecs
kconfig
@@ -4585,7 +4585,7 @@ the passwords on KDE work spaces.")
(native-inputs
(list extra-cmake-modules kdoctools-5))
(inputs
(list gpgme
(list gpgme-2
kauth-5
kcodecs-5
kconfig-5
+8 -8
View File
@@ -581,7 +581,7 @@ PIM data into Akonadi for use in KDE PIM applications.")
akonadi-mime
boost
breeze-icons
gpgme
gpgme-2
grantleetheme
kcmutils
kcontacts
@@ -785,7 +785,7 @@ information.")
akonadi-mime
akonadi-search
boost
gpgme
gpgme-2
grantleetheme
kcalendarcore
kcmutils
@@ -1552,7 +1552,7 @@ protocol for querying and modifying directory services running over TCP/IP.")
kdoctools))
(inputs
(list boost
gpgme
gpgme-2
kcmutils
kcodecs
kconfig
@@ -1614,7 +1614,7 @@ and retrieving certificates from LDAP servers.")
akonadi-mime
akonadi-search
boost
gpgme
gpgme-2
grantleetheme
kaddressbook
kbookmarks
@@ -1788,7 +1788,7 @@ KMail.")
(inputs
(list akonadi-contacts
boost
gpgme
gpgme-2
grantleetheme
karchive
kcodecs
@@ -1972,7 +1972,7 @@ using a Qt/KMime C++ API.")
(list akonadi-contacts
akonadi-search
boost
gpgme
gpgme-2
grantleetheme
karchive
kcalendarcore
@@ -2634,7 +2634,7 @@ various Google services.")
(list extra-cmake-modules kdoctools qttools))
(inputs
(list boost
gpgme
gpgme-2
kcodecs
kcompletion
kconfig
@@ -2648,7 +2648,7 @@ various Google services.")
kpimtextedit
qgpgme))
(propagated-inputs
(list gpgme qgpgme))
(list gpgme-2 qgpgme))
(arguments
(list
#:qtbase qtbase
+1 -1
View File
@@ -344,7 +344,7 @@ your computer.")
"02g9k51srrqslapjxzcymnmy9v1frv9pkgg8wmf6d0607hwkaff5"))))
(build-system qt-build-system)
(native-inputs (list extra-cmake-modules))
(inputs (list gpgme
(inputs (list gpgme-2
kauth
karchive
kcoreaddons
+2 -2
View File
@@ -60,14 +60,14 @@ Java libraries.")
(define-public libidn2
(package
(name "libidn2")
(version "2.3.7")
(version "2.3.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/libidn/" name "-" version
".tar.gz"))
(sha256
(base32
"0r3xzmmrx4hsc53jdncd5yqmkwzjgc4vh4hfkndm3f8hns8sf8ac"))))
"0ykqq39yacg9vvf2alyl5sskbfr531dmzwrgyzhj25hpyqdr2mzm"))))
(inputs
(list libunistring))
(build-system gnu-build-system)
@@ -1,92 +0,0 @@
Upstream-status:
diff --git a/tests/pkcs11-tool.sh b/tests/pkcs11-tool.sh
index 2d650b52f..e64803fc3 100755
--- a/tests/pkcs11-tool.sh
+++ b/tests/pkcs11-tool.sh
@@ -64,7 +64,7 @@ if ! test -f "${SOFTHSM_MODULE}"; then
exit 77
fi
-if [ -z "$(which pkcs11-tool 2>/dev/null)" ]; then
+if ! command -v pkcs11-tool >/dev/null; then
echo "Need pkcs11-tool from opensc package to run this test."
exit 77
fi
diff --git a/tests/tpm2.sh b/tests/tpm2.sh
index d48364c6c..a03945da8 100755
--- a/tests/tpm2.sh
+++ b/tests/tpm2.sh
@@ -29,22 +29,22 @@ if ! test -x "${CERTTOOL}"; then
exit 77
fi
-if [ -z "$(which swtpm 2>/dev/null)" ]; then
+if ! command -v swtpm >/dev/null; then
echo "Need swtpm package to run this test."
exit 77
fi
-if [ -z "$(which ncat 2>/dev/null)" ]; then
+if ! command -v ncat >/dev/null; then
echo "Need ncat from nmap-ncat package to run this test."
exit 77
fi
-if [ -z "$(which tpm2_startup 2>/dev/null)" ]; then
+if ! command -v tpm2_startup >/dev/null; then
echo "Need tpm2_startup from tpm2-tools package to run this test."
exit 77
fi
-if [ -z "$(which base64 2>/dev/null)" ]; then
+if ! command -v base64 >/dev/null; then
echo "Need the base64 tool to run this test."
exit 77
fi
@@ -58,7 +58,7 @@ case `"$OPENSSL" version` in
;;
esac
-if [ -z "$(which tpm2tss-genkey 2>/dev/null)" ]; then
+if ! command -v tpm2tss-genkey >/dev/null; then
echo "Need tpm2tss-genkey from tpm2-tss-engine package to run this test."
exit 77
fi
diff --git a/tests/tpmtool_test.sh b/tests/tpmtool_test.sh
index a14242808..962d571f6 100755
--- a/tests/tpmtool_test.sh
+++ b/tests/tpmtool_test.sh
@@ -28,27 +28,27 @@ if [ "$(id -u)" -ne 0 ]; then
exit 77
fi
-if [ -z "$(which swtpm 2>/dev/null)" ]; then
+if ! command -v swtpm >/dev/null; then
echo "Need swtpm package to run this test."
exit 77
fi
-if [ -z "$(which tcsd 2>/dev/null)" ]; then
+if ! command -v tcsd >/dev/null; then
echo "Need tcsd (TrouSerS) package to run this test."
exit 77
fi
-if [ -z "$(which tpm_createek 2>/dev/null)" ]; then
+if ! command -v tpm_createek >/dev/null; then
echo "Need tpm_createek from tpm-tools package to run this test."
exit 77
fi
-if [ -z "$(which ncat 2>/dev/null)" ]; then
+if ! command -v ncat >/dev/null; then
echo "Need ncat from nmap-ncat package to run this test."
exit 77
fi
-if [ -z "$(which expect 2>/dev/null)" ]; then
+if ! command -v expect >/dev/null; then
echo "Need expect from expect package to run this test."
exit 77
fi
@@ -1,22 +0,0 @@
Inspired by
https://github.com/gentoo/gentoo/commit/2ad1ddf9b8b0e0b1f91fc3dd9412ad2f9c1346c3
see also
https://dev.gnupg.org/rMecd0c86d62351d267bdc9566286c532a394c711b
Gemeinsame Unterverzeichnisse: gpg-1.10.0.alt/examples und gpg-1.10.0/examples.
Gemeinsame Unterverzeichnisse: gpg-1.10.0.alt/gpg und gpg-1.10.0/gpg.
diff -u gpg-1.10.0.alt/setup.py gpg-1.10.0/setup.py
--- gpg-1.10.0.alt/setup.py 2025-12-13 21:18:02.595203761 +0100
+++ gpg-1.10.0/setup.py 2025-12-13 21:19:42.624197460 +0100
@@ -220,9 +220,9 @@
def run(self):
self._generate()
- swig_sources.extend((self._in_build_base('gpgme.i'), self._in_build_base('helpers.c')))
- swig_opts.extend(['-I' + self.build_base,
- '-outdir', os.path.join(self.build_lib, 'gpg')])
+ swige.sources.extend((self._in_build_base('gpgme.i'), self._in_build_base('helpers.c')))
+ swige.swig_opts.extend(['-I' + self.build_base,
+ '-outdir', os.path.join(self.build_lib, 'gpg')])
include_dirs.insert(0, self.build_base)
self.run_command('build_ext')
+3 -4
View File
@@ -14,7 +14,7 @@
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Sergey Trofimov <sarg@sarg.org.ru>
;;; Copyright © 2021 Dhruvin Gandhi <contact@dhruvin.dev>
;;; Copyright © 2021 Ahmad Jarara <git@ajarara.io>
;;; Copyright © 2021, 2026 Ahmad Jarara <ajarara@fastmail.com>
;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
@@ -1163,9 +1163,8 @@ phone and a running pcscd service are required.")
(arguments
(list
#:configure-flags
#~(list (string-append "-DUDEV_RULES_DIR=" #$output "/lib/udev/rules.d"))
;; regress tests enabled only for debug builds
#:tests? #f))
#~(list
(string-append "-DUDEV_RULES_DIR=" #$output "/lib/udev/rules.d"))))
(synopsis "Library functionality and command-line tools for FIDO devices")
(description "libfido2 provides library functionality and command-line
tools to communicate with a FIDO device over USB, and to verify attestation
+4 -5
View File
@@ -151,14 +151,14 @@ in intelligent transportation networks.")
(define-public p11-kit
(package
(name "p11-kit")
(version "0.25.5")
(version "0.26.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/p11-glue/p11-kit/releases/"
"download/" version "/p11-kit-" version ".tar.xz"))
(sha256
(base32 "1rcq2578aq3ag288qnvdmj4a2wbihncndbr6iw0vxcfda1jail04"))))
(base32 "0a7qxkfaj7ayq5b3vw850h6ndr88f37ygmbk3qaa64s8v929zz89"))))
(build-system gnu-build-system)
(native-inputs
(list nss-certs ;default certificates
@@ -210,7 +210,7 @@ living in the same process.")
(define-public gnutls
(package
(name "gnutls")
(version "3.8.9")
(version "3.8.13")
(source (origin
(method url-fetch)
;; Note: Releases are no longer on ftp.gnu.org since the
@@ -218,10 +218,9 @@ living in the same process.")
(uri (string-append "mirror://gnupg/gnutls/v"
(version-major+minor version)
"/gnutls-" version ".tar.xz"))
(patches (search-patches "gnutls-no-which.patch"))
(sha256
(base32
"1v9090cbajf02cw01idfbp0cgmgjn5091ff1b96hqryi0bc17qb9"))))
"0zn9m5nb3a4r9rh5ws3xaczbals7vrvy7ahl9xnl5hh9pz0qxvgz"))))
(build-system gnu-build-system)
(arguments
(list #:tests? (not (or (%current-target-system)