diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-17 10:39:47 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-17 10:39:47 +0100 |
| commit | 67a3c8ed15f62a39f8684ee9c8dda024de9296a9 (patch) | |
| tree | 7c672b8caef49acd944daeb25fb57aaa5d617e77 /gnu/packages/tls.scm | |
| parent | b6bee63bed4f013064c0d902e7c8b83ed7514ade (diff) | |
| download | guix-patches-67a3c8ed15f62a39f8684ee9c8dda024de9296a9.tar guix-patches-67a3c8ed15f62a39f8684ee9c8dda024de9296a9.tar.gz | |
gnu: GnuTLS: Build with Guile 3.
This is a follow-up to commit b6bee63bed4f013064c0d902e7c8b83ed7514ade.
* gnu/packages/tls.scm (gnutls)[inputs]: Change from GUILE-2.2 to GUILE-3.0.
(guile3.0-gnutls): Rename to ...
(guile2.2-gnutls): ... this. Use GUILE-2.2.
(guile3.0-gnutls): New variable.
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f94c2a1077..f84d29ecbb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -229,7 +229,7 @@ living in the same process.") ("datefudge" ,datefudge) ;tests rely on 'datefudge' ("util-linux" ,util-linux))) ;one test needs 'setsid' (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-3.0))) (propagated-inputs ;; These are all in the 'Requires.private' field of gnutls.pc. `(("libtasn1" ,libtasn1) @@ -266,14 +266,16 @@ required structures.") (inputs `(("unbound" ,unbound) ,@(package-inputs gnutls))))) -(define-public guile3.0-gnutls +(define-public guile2.2-gnutls (package (inherit gnutls) - (name "guile3.0-gnutls") - (inputs `(("guile" ,guile-next) + (name "guile2.2-gnutls") + (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs gnutls)))))) +(define-public guile3.0-gnutls gnutls) + (define-public openssl (package (name "openssl") |