diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/security-token.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/security-token.scm')
| -rw-r--r-- | gnu/packages/security-token.scm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index f2cd6e33af..a0c732dee1 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -122,7 +122,7 @@ readers and is needed to communicate with such devices through the (define-public eid-mw (package (name "eid-mw") - (version "5.1.6") + (version "5.1.8") (source (origin (method git-fetch) @@ -131,7 +131,7 @@ readers and is needed to communicate with such devices through the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19sq9bs1580zrjw0cxykdvrm1rwfw8n0vbvy9kdjnykjjnb7g6g1")))) + (base32 "11jf828ag8y5iykcfjmjc3n8g5mchpl3fxkr110civ3qqbdiw882")))) (build-system glib-or-gtk-build-system) (native-inputs (list autoconf @@ -893,7 +893,7 @@ phone is required.") (define-public libfido2 (package (name "libfido2") - (version "1.11.0") + (version "1.12.0") (source (origin (method git-fetch) @@ -901,21 +901,21 @@ phone is required.") (url "https://github.com/Yubico/libfido2") (commit version))) (file-name (git-file-name name version)) - (sha256 (base32 "1nk4irmdg36930lgc892qmlmd4whz4fq37wknkdx5ap57i5x18i6")))) + (sha256 (base32 "123rysl21bmgk6rmpgg5s21a5ksmxnn1hc32ws88h7z0q4icvj87")))) (native-inputs (list pkg-config)) (inputs (list eudev libcbor openssl zlib)) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append + (list + #:configure-flags + #~(list (string-append "-DPKG_CONFIG_EXECUTABLE=" (search-input-file %build-inputs (string-append - "/bin/" ,(pkg-config-for-target))))) - #:phases - (modify-phases %standard-phases - ;; regress tests enabled only for debug builds - (delete 'check)))) + "/bin/" #$(pkg-config-for-target)))) + (string-append "-DUDEV_RULES_DIR=" #$output "/lib/udev/rules.d")) + ;; regress tests enabled only for debug builds + #:tests? #f)) (synopsis "Library functionality and command-line tools for FIDO devices") (description "libfido2 provides library functionality and command-line tools to communicate with a FIDO device over USB, and to verify attestation |