me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Marius Bakke 2022-06-26 19:44:29 +02:00
parent a2d231ad15
commit 6be081eb12
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/package-management.scm
View File

@ -1962,7 +1962,7 @@ cp -r /tmp/locale/*/en_US.*")))
libsoup-minimal-2 libsoup-minimal-2
libxau libxau
libxml2 libxml2
p11-kit-next p11-kit
util-linux util-linux
xdg-dbus-proxy)) xdg-dbus-proxy))
(propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas)) (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas))

27
gnu/packages/tls.scm
View File

@ -137,14 +137,14 @@ in intelligent transportation networks.")
(define-public p11-kit (define-public p11-kit
(package (package
(name "p11-kit") (name "p11-kit")
(version "0.23.22") (version "0.24.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/p11-glue/p11-kit/releases/" (uri (string-append "https://github.com/p11-glue/p11-kit/releases/"
"download/" version "/p11-kit-" version ".tar.xz")) "download/" version "/p11-kit-" version ".tar.xz"))
(sha256 (sha256
(base32 "1dn6br4v033d3gp2max9lsr3y4q0nj6iyr1yq3kzi8ym7lal13wa")))) (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(append (list pkg-config) (append (list pkg-config)
@ -157,7 +157,10 @@ in intelligent transportation networks.")
(list libbsd) (list libbsd)
'()))) '())))
(arguments (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 #:phases #~(modify-phases %standard-phases
#$@(if (hurd-target?) #$@(if (hurd-target?)
#~((add-after 'unpack 'apply-hurd-patch #~((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.") living in the same process.")
(license license:bsd-3))) (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 (define-public gnutls
(package (package
(name "gnutls") (name "gnutls")