diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/gsasl.scm | |
parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
download | guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/gsasl.scm')
-rw-r--r-- | gnu/packages/gsasl.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 98acc3c756..d2aba5450d 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,14 +79,14 @@ the underlying security implementation.") (define-public gsasl (package (name "gsasl") - (version "1.8.1") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gsasl/gsasl-" version ".tar.gz")) (sha256 (base32 - "1lnqfbaajkj1r2fx1db1qgcxy69pfgbyq7xd2kpvyxhra4m1dnjd")))) + "1lv8fp01aq4jjia9g4vkx90zacl8rgmjhfi6f1wdwnh9ws7bvg45")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-gssapi-impl=mit" @@ -96,6 +97,9 @@ the underlying security implementation.") ("libntlm" ,libntlm) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib))) + (native-inputs + `(;; Needed for cross compiling. + ("libgcrypt" ,libgcrypt))) (propagated-inputs ;; Propagate GnuTLS because libgnutls.la reads `-lnettle', and Nettle is a ;; propagated input of GnuTLS. |