Merge branch 'main' of gitlab.univ-nantes.fr:glicid-public/guix-glicid into main

This commit is contained in:
Yann Dupont 2021-11-24 13:41:04 +01:00
commit 1098e8e4a5

View file

@ -121,9 +121,9 @@
(use-modules ((guix licenses) #:prefix license:))
(define-public glicid-libcbor
(define-public libcbor-0.8.0
(package
(name "glicid-libcbor")
(name "libcbor")
(version "0.8.0")
(source
(origin
@ -152,10 +152,27 @@
))
(define-public glicid-libfido2
(define-public libcbor-0.9.0
(package
(inherit libcbor-0.8.0)
(version "0.9.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
(sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))
)
)
)
)
(define-public libcbor-latest libcbor-0.9.0)
(define-public libfido2-1.8.0
(package
(name "glicid-libfido2")
(name "libfido2")
(version "1.8.0")
(source
(origin
@ -176,7 +193,7 @@
(inputs `(
("glicid-libcbor",glicid-libcbor)
("libcbor",libcbor-latest)
("openssl",openssl)
("zlib", zlib)
("pkg-config", pkg-config) ; or cmake won't find zlib !
@ -193,10 +210,27 @@
)
(define-public glicid-specific-openssh
(define-public libfido2-1.9.0
(package
(inherit libfido2-1.8.0)
(version "1.9.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
; (file-name (string-append name "-" version ".tar.gz"))
(sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds"))
)
)
)
)
(define libfido2-latest libfido2-1.9.0)
(define-public openssh-with-fido2
(package
(inherit openssh)
(name "glicid-specific-openssh")
(name "openssh-with-fido2")
(arguments
`(#:test-target "tests"
@ -273,8 +307,8 @@
)
)
(inputs `(("glicid-libfido2", glicid-libfido2)
("glicid-libcbor", glicid-libcbor)
(inputs `(("libfido2", libfido2-latest)
("libcbor", libcbor-latest)
,@(package-inputs openssh)))