diff options
| author | Marius Bakke <marius@gnu.org> | 2022-06-26 19:44:29 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-06-26 22:58:34 +0200 |
| commit | 6be081eb12a9976bb0509b32cadea9f2246c9c4a (patch) | |
| tree | 4043cf55e00c83330f88e1f1024ac389ede7d403 /gnu | |
| parent | a2d231ad15a5da9d5a3d52951992a4cfa67d1d86 (diff) | |
| download | guix-6be081eb12a9976bb0509b32cadea9f2246c9c4a.tar.gz | |
gnu: Remove p11-kit@0.23.22.
* gnu/packages/tls.scm (p11-kit): Merge with ... (p11-kit-next): ... this removed variable. * gnu/packages/package-management.scm (flatpak)[inputs]: Change from P11-KIT-NEXT to P11-KIT.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/package-management.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/tls.scm | 27 |
2 files changed, 7 insertions, 22 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 79f7eec384..43ca40599f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1962,7 +1962,7 @@ cp -r /tmp/locale/*/en_US.*"))) libsoup-minimal-2 libxau libxml2 - p11-kit-next + p11-kit util-linux xdg-dbus-proxy)) (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas)) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index be3f8d109d..bb05adb8b7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -137,14 +137,14 @@ in intelligent transportation networks.") (define-public p11-kit (package (name "p11-kit") - (version "0.23.22") + (version "0.24.1") (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 "1dn6br4v033d3gp2max9lsr3y4q0nj6iyr1yq3kzi8ym7lal13wa")))) + (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq")))) (build-system gnu-build-system) (native-inputs (append (list pkg-config) @@ -157,7 +157,10 @@ in intelligent transportation networks.") (list libbsd) '()))) (arguments - (list #:configure-flags #~'("--without-trust-paths") + (list #:configure-flags + ;; Use the default certificates so that users such as flatpak + ;; find them. See <https://issues.guix.gnu.org/49957>. + #~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt") #:phases #~(modify-phases %standard-phases #$@(if (hurd-target?) #~((add-after 'unpack 'apply-hurd-patch @@ -189,24 +192,6 @@ coordinating the use of PKCS#11 by different components or libraries living in the same process.") (license license:bsd-3))) -(define-public p11-kit-next - (package - (inherit p11-kit) - (version "0.24.1") - (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 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq")))) - (arguments - ;; Use the default certificates so that users such as flatpak find them. - ;; See <https://issues.guix.gnu.org/49957>. - (substitute-keyword-arguments (package-arguments p11-kit) - ((#:configure-flags flags #~'()) - #~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt")))))) - (define-public gnutls (package (name "gnutls") |