summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-09-25 19:02:13 +0200
committerLudovic Courtès <ludo@gnu.org>2020-09-25 19:05:08 +0200
commit795065533d3326e02326509d93d3bab7105d97a3 (patch)
treed23dbeac32f69aba381be86244b001c9b3232635
parent0fa3d89fbce36d82e4e4ae9da2753425594e8aa2 (diff)
downloadguix-795065533d3326e02326509d93d3bab7105d97a3.tar.gz
gnu: Replace uses of 'guile3.0-gnutls' by 'gnutls'.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Use
GNUTLS instead of GUILE3.0-GNUTLS.
(guix-daemon)[inputs]: Likewise.
* guix/self.scm (specification->package): Likewise.
-rw-r--r--gnu/packages/package-management.scm4
-rw-r--r--guix/self.scm2
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index ec87226197..99f78f2ac8 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -384,7 +384,7 @@ $(prefix)/etc/init.d\n")))
 
          ("glibc-utf8-locales" ,glibc-utf8-locales)))
       (propagated-inputs
-       `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 guile3.0-gnutls))
+       `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 gnutls))
          ("guile-gcrypt" ,guile-gcrypt)
          ("guile-json" ,guile-json-4)
          ("guile-sqlite3" ,guile-sqlite3)
@@ -418,7 +418,7 @@ the Nix package manager.")
      (fold alist-delete (package-native-inputs guix)
            '("po4a" "graphviz" "help2man")))
     (inputs
-     `(("gnutls" ,guile3.0-gnutls)
+     `(("gnutls" ,gnutls)
        ("guile-git" ,guile-git)
        ("guile-json" ,guile-json-3)
        ("guile-gcrypt" ,guile-gcrypt)
diff --git a/guix/self.scm b/guix/self.scm
index 02ef982c7c..5eb80f42fe 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -56,7 +56,7 @@
       ("guile-zlib" (ref '(gnu packages guile) 'guile-zlib))
       ("guile-lzlib" (ref '(gnu packages guile) 'guile-lzlib))
       ("guile-gcrypt"  (ref '(gnu packages gnupg) 'guile-gcrypt))
-      ("gnutls"     (ref '(gnu packages tls) 'guile3.0-gnutls))
+      ("gnutls"     (ref '(gnu packages tls) 'gnutls))
       ("gzip"       (ref '(gnu packages compression) 'gzip))
       ("bzip2"      (ref '(gnu packages compression) 'bzip2))
       ("xz"         (ref '(gnu packages compression) 'xz))