From 879b1ee39d58600186d4f33a48cf1ef645b274be Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 1 Aug 2025 22:49:22 -0300 Subject: [PATCH] gnu: Reorder package definitions on screen.scm. * gnu/packages/screen.scm: Reorder package definitions alphabetically. Change-Id: Ic9596a7158fb282b6cf8ea6f2272782425832c7f Signed-off-by: Liliana Marie Prikler --- gnu/packages/screen.scm | 170 ++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index 05e4a368a77702104fddc654961920033f69d86d..34aedb8723e6e0e4fec50eb965aac0c8553ebf78 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -72,91 +72,6 @@ be detached---run in the background---and then later reattached.") (home-page "https://www.brain-dump.org/projects/abduco/") (license license:isc))) -(define-public screen - (package - (name "screen") - (version "5.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/screen.git") - (commit (string-append "v." version)))) - (file-name (git-file-name name version)) - (patches (search-patches "screen-hurd-path-max.patch")) - (sha256 - (base32 "1km6qbczlvzwcaagb8fy65k5z6ywn2whw57wdkfxg9dh9kg39hg7")) - (snippet - #~(begin (use-modules (guix build utils)) - ;; Fixes https://savannah.gnu.org/bugs/?67126. - ;; Can be removed with 5.0.2? - (with-fluids ((%default-port-encoding #f)) - (substitute* "src/doc/screen.texinfo" - (("alexander_naumov@opensuse.org") - "alexander_naumov@@opensuse.org"))))))) - (build-system gnu-build-system) - (native-inputs - (list autoconf-2.71 automake texinfo)) - (inputs - (list libxcrypt linux-pam ncurses perl)) - (arguments - (list - #:configure-flags - ;; GNU_SOURCE must be defined for mallocmock_reset() to be defined - #~(list (string-append "CFLAGS=-O2 -g -D_GNU_SOURCE=1" - ;; relax gcc-14's strictness, needed for tests. - " -Wno-error=int-conversion" - " -Wno-error=incompatible-pointer-types") - - ;; By default, screen supports 16 colors, but we want 256 when - ;; ~/.screenrc contains 'term xterm-256color'. - "--enable-colors256") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "src")))))) - (home-page "https://www.gnu.org/software/screen/") - (synopsis "Full-screen window manager providing multiple terminals") - (description - "GNU Screen is a terminal window manager that multiplexes a single -terminal between several processes. The virtual terminals each provide -features such as a scroll-back buffer and a copy-and-paste mechanism. Screen -then manages the different virtual terminals, allowing you to easily switch -between them, to detach them from the current session, or even splitting the -view to show two terminals at once.") - (license license:gpl2+))) - -(define-public dtach - (package - (name "dtach") - (version "0.9") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - version "/" name "-" version ".tar.gz")) - (sha256 - (base32 - "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j")))) - (build-system gnu-build-system) - (arguments - ;; No install target. - '(#:phases - (modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "dtach" (string-append out "/bin")) - (install-file "dtach.1" (string-append out "/share/man/man1")) - #t)))) - ;; No check target. - #:tests? #f)) - (home-page "https://dtach.sourceforge.net/") - (synopsis "Emulates the detach feature of screen") - (description - "dtach is a tiny program that emulates the detach feature of screen, -allowing you to run a program in an environment that is protected from the -controlling terminal and attach to it later.") - (license license:gpl2+))) - (define-public byobu (package (name "byobu") @@ -207,6 +122,38 @@ configuration utilities, and system status notifications for the GNU Screen window manager as well as the Tmux terminal multiplexer.") (license license:gpl3+))) +(define-public dtach + (package + (name "dtach") + (version "0.9") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + version "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j")))) + (build-system gnu-build-system) + (arguments + ;; No install target. + '(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "dtach" (string-append out "/bin")) + (install-file "dtach.1" (string-append out "/share/man/man1")) + #t)))) + ;; No check target. + #:tests? #f)) + (home-page "https://dtach.sourceforge.net/") + (synopsis "Emulates the detach feature of screen") + (description + "dtach is a tiny program that emulates the detach feature of screen, +allowing you to run a program in an environment that is protected from the +controlling terminal and attach to it later.") + (license license:gpl2+))) + (define-public reptyr (package (name "reptyr") @@ -241,3 +188,56 @@ reptyr to grab it, and then kill the @code{ssh} session and head on home.") ;; Reptyr currently does not support mips. (supported-systems (delete "mips64el-linux" %supported-systems)) (license license:expat))) + +(define-public screen + (package + (name "screen") + (version "5.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/screen.git") + (commit (string-append "v." version)))) + (file-name (git-file-name name version)) + (patches (search-patches "screen-hurd-path-max.patch")) + (sha256 + (base32 "1km6qbczlvzwcaagb8fy65k5z6ywn2whw57wdkfxg9dh9kg39hg7")) + (snippet + #~(begin (use-modules (guix build utils)) + ;; Fixes https://savannah.gnu.org/bugs/?67126. + ;; Can be removed with 5.0.2? + (with-fluids ((%default-port-encoding #f)) + (substitute* "src/doc/screen.texinfo" + (("alexander_naumov@opensuse.org") + "alexander_naumov@@opensuse.org"))))))) + (build-system gnu-build-system) + (native-inputs + (list autoconf-2.71 automake texinfo)) + (inputs + (list libxcrypt linux-pam ncurses perl)) + (arguments + (list + #:configure-flags + ;; GNU_SOURCE must be defined for mallocmock_reset() to be defined + #~(list (string-append "CFLAGS=-O2 -g -D_GNU_SOURCE=1" + ;; relax gcc-14's strictness, needed for tests. + " -Wno-error=int-conversion" + " -Wno-error=incompatible-pointer-types") + + ;; By default, screen supports 16 colors, but we want 256 when + ;; ~/.screenrc contains 'term xterm-256color'. + "--enable-colors256") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "src")))))) + (home-page "https://www.gnu.org/software/screen/") + (synopsis "Full-screen window manager providing multiple terminals") + (description + "GNU Screen is a terminal window manager that multiplexes a single +terminal between several processes. The virtual terminals each provide +features such as a scroll-back buffer and a copy-and-paste mechanism. Screen +then manages the different virtual terminals, allowing you to easily switch +between them, to detach them from the current session, or even splitting the +view to show two terminals at once.") + (license license:gpl2+)))