diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/crypto.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/crypto.scm')
| -rw-r--r-- | gnu/packages/crypto.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b5672cbe50..8848954ab8 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -944,14 +944,14 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R (define-public botan (package (name "botan") - (version "2.17.3") + (version "2.18.1") (source (origin (method url-fetch) (uri (string-append "https://botan.randombit.net/releases/" "Botan-" version ".tar.xz")) (sha256 (base32 - "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr")))) + "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq")))) (build-system gnu-build-system) (arguments '(#:phases @@ -976,7 +976,9 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R (add-before 'check 'library-path-for-tests (lambda _ (setenv "LD_LIBRARY_PATH" (getcwd)))) (replace 'check - (lambda _ (invoke "./botan-test")))))) + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "./botan-test"))))))) (native-inputs `(("python" ,python-wrapper) ("python-docutils" ,python-docutils))) @@ -1297,7 +1299,7 @@ Trusted comments are signed, thus verified, before being displayed.") (define-public libolm (package (name "libolm") - (version "3.2.2") + (version "3.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -1305,7 +1307,7 @@ Trusted comments are signed, thus verified, before being displayed.") (commit version))) (sha256 (base32 - "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy")) + "0bixly6jqpwfx3p37c1qp1j685yg6m429r1nazwh43w4n527bs3y")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments |