From 02312f7bbe289aa87b5708c4e3b9da4ad25fe436 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 25 Nov 2020 08:11:11 -0600 Subject: gnu: eternalterminal: Update to 6.0.13. * gnu/packages/terminals.scm (eternalterminal): Update to 6.0.13. --- gnu/packages/terminals.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f17c36cf2b..9a3df80037 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2018, 2019 Eric Bavier ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Pierre Langlois -;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Valentin Ignatev ;;; Copyright © 2020 Michael Rohleder @@ -1044,7 +1044,7 @@ comfortably in a pager or editor. (define-public eternalterminal (package (name "eternalterminal") - (version "6.0.7") + (version "6.0.13") (source (origin (method git-fetch) @@ -1053,7 +1053,7 @@ comfortably in a pager or editor. (commit (string-append "et-v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h")))) + (base32 "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_TEST=ON") -- cgit 1.4.1 From 435739ff48ab8eefc2120af23fc296a579308987 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 25 Nov 2020 08:24:55 -0600 Subject: 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(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 9f60b3c02e..e5bcac33f2 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 9a3df80037..ff729c4882 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") -- cgit 1.4.1 From e16fbddf2b1289ec0f4dcd6d625a73ccdbfd0230 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 25 Nov 2020 08:28:53 -0600 Subject: gnu: et: Deprecate package. * gnu/packages/terminals.scm (et): Deprecate in favor of eternalterminal. --- gnu/packages/terminals.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index ff729c4882..c9d57bee67 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1082,34 +1082,7 @@ while also supporting native scrolling and @command{tmux} control mode (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))) + (deprecated-package "et" eternalterminal)) (define-public wterm (package -- cgit 1.4.1