GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into 'main'

Browse source 
fido2 and cbor are now defined upstream

See merge request glicid-public/guix-glicid!107
This commit is contained in:
Jean-François GUILLAUME 2022-10-19 14:02:46 +00:00
commit 46bb1386e9
2 changed files with 60 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
glicid/packages/containers.scm
View file

@ -6,6 +6,21 @@
) )
(define-public podman (define-public podman
(package
(inherit gnu:podman)
(name "podman")
(version "4.3.0")
(source (origin
(method url-fetch)
(uri (list
(string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz")
))
(sha256 (base32 "0d5zfi6drac23vb2la2v5s2g27hbz9wgiyvlxfm7hgzjh2ds18sm"))
))
)
)
(define-public podman-4.2.1
(package (package
(inherit gnu:podman) (inherit gnu:podman)
(name "podman") (name "podman")

90
glicid/packages/ssh.scm
View file

@ -53,52 +53,52 @@
(define-public libcbor-latest libcbor-0.9.0) (define-public libcbor-latest libcbor-0.9.0)
(define-public libfido2-1.8.0 ;(define-public libfido2-1.8.0
(package ; (package
(name "libfido2") ; (name "libfido2")
(version "1.8.0") ; (version "1.8.0")
(source ; (source
(origin ; (origin
(method url-fetch) ; (method url-fetch)
(uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz")) ; (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
(sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm")) ; (sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
) ; )
) ; )
(build-system cmake-build-system) ; (build-system cmake-build-system)
(arguments '( ; (arguments '(
#:tests? #f ; #:tests? #f
)) ; ))
(inputs `( ; (inputs `(
("libcbor",libcbor-latest) ; ("libcbor",libcbor-latest)
("openssl",openssl) ; ("openssl",openssl)
("zlib", zlib) ; ("zlib", zlib)
("pkg-config", pkg-config) ; ("pkg-config", pkg-config)
("eudev", eudev) ; ("eudev", eudev)
)) ; ))
(synopsis "libfido2") ; (synopsis "libfido2")
(description "Todo") ; (description "Todo")
(home-page "toto") ; (home-page "toto")
(license license:gpl2+) ; (license license:gpl2+)
) ; )
) ;)
(define-public libfido2-1.9.0 ;(define-public libfido2-1.9.0
(package ; (package
(inherit libfido2-1.8.0) ; (inherit libfido2-1.8.0)
(version "1.9.0") ; (version "1.9.0")
(source ; (source
(origin ; (origin
(method url-fetch) ; (method url-fetch)
(uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz")) ; (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
(sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds")) ; (sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds"))
) ; )
) ; )
) ; )
) ;)
(define libfido2-latest libfido2-1.9.0) ;(define libfido2-latest libfido2-1.9.0)
(define-public openssh-with-fido2 (define-public openssh-with-fido2 ;; this is has to be worked again
(package (package
(inherit openssh) (inherit openssh)
(name "openssh-with-fido2") (name "openssh-with-fido2")
@ -172,8 +172,8 @@
) )
)) ))
(inputs `( (inputs `(
("libfido2", libfido2-latest) ("libfido2", libfido2)
("libcbor", libcbor-latest) ("libcbor", libcbor)
,@(package-inputs openssh) ,@(package-inputs openssh)
)) ))
) )