diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm index 8b799b0..888efea 100644 --- a/glicid/packages/ssh.scm +++ b/glicid/packages/ssh.scm @@ -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,6 +152,23 @@ )) +(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 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031")) + ) + ) + ) +) + +(define-public libcbor-latest libcbor-0.9.0) + (define-public libfido2-1.8.0 (package @@ -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 ! @@ -210,10 +227,10 @@ (define libfido2-latest libfido2-1.9.0) -(define-public glicid-specific-openssh +(define-public openssh-with-fido2 (package (inherit openssh) - (name "glicid-specific-openssh") + (name "openssh-with-fido2") (arguments `(#:test-target "tests" @@ -291,7 +308,7 @@ ) (inputs `(("libfido2", libfido2-latest) - ("glicid-libcbor", glicid-libcbor) + ("libcbor", libcbor-latest) ,@(package-inputs openssh)))