01/02: gnu: et: Work around recursive module imports.

[guix-commits]

brettgilio pushed a commit to branch master
in repository guix.

commit 435739ff48ab8eefc2120af23fc296a579308987
Author: Brett Gilio <brettg@gnu.org>
AuthorDate: Wed Nov 25 08:24:55 2020 -0600

    gnu: et: Work around recursive module imports.
    
    * gnu/packages/ssh.scm (et): Remove.
    * gnu/packages/terminals.scm (et): Add et.
---
 gnu/packages/ssh.scm       | 30 ------------------------------
 gnu/packages/terminals.scm | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 9f60b3c..e5bcac3 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -487,36 +487,6 @@ of user keystrokes.  It's a replacement for SSH that's 
more robust and
 responsive, especially over Wi-Fi, cellular, and long-distance links.")
     (license license:gpl3+)))
 
-(define-public et
-  (package
-    (name "et")
-    (version "3.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/MisterTea/EternalTCP";)
-             (commit (string-append "et-v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1m5caxckn2ihwp9s2pbyh5amxlpwr7yc54q8s0kb10fr52w2vfnm"))))
-    (build-system cmake-build-system)
-    (arguments `(#:tests? #f))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs `(("glog" ,glog)
-              ("gflags" ,gflags)
-              ("libsodium" ,libsodium)
-              ("protobuf" ,protobuf)))
-    (synopsis "Remote shell that automatically reconnects")
-    (description
-     "Eternal Terminal (ET) is a remote shell that automatically reconnects
-without interrupting the session.  Unlike SSH sessions, ET sessions will
-survive even network outages and IP changes.  ET uses a custom protocol over
-TCP, not the SSH protocol.")
-    (home-page "https://eternalterminal.dev/";)
-    (license license:asl2.0)))
-
 (define-public dropbear
   (package
     (name "dropbear")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 9a3df80..ff729c4 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1081,6 +1081,36 @@ while also supporting native scrolling and 
@command{tmux} control mode
 (@code{tmux -CC}).")
     (license license:asl2.0)))
 
+(define-public et
+  (package
+    (name "et")
+    (version "3.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/MisterTea/EternalTCP";)
+             (commit (string-append "et-v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1m5caxckn2ihwp9s2pbyh5amxlpwr7yc54q8s0kb10fr52w2vfnm"))))
+    (build-system cmake-build-system)
+    (arguments `(#:tests? #f))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs `(("glog" ,glog)
+              ("gflags" ,gflags)
+              ("libsodium" ,libsodium)
+              ("protobuf" ,protobuf)))
+    (synopsis "Remote shell that automatically reconnects")
+    (description
+     "Eternal Terminal (ET) is a remote shell that automatically reconnects
+without interrupting the session.  Unlike SSH sessions, ET sessions will
+survive even network outages and IP changes.  ET uses a custom protocol over
+TCP, not the SSH protocol.")
+    (home-page "https://eternalterminal.dev/";)
+    (license license:asl2.0)))
+
 (define-public wterm
   (package
     (name "wterm")