03/07: gnu: Remove nano.scm.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit e11e65a9ad08e18ea2faac3c9f4639a7b189bf76
Author: Jaeme Sifat <jaeme@runbox.com>
AuthorDate: Sat Dec 23 17:11:53 2023 -0500

    gnu: Remove nano.scm.
    
    Removes nano.scm and places the `nano' package within text-editors.scm.
    
    * gnu/local.mk (GNU_SYSTEM_MODULES): Remove nano.scm from build.
    * gnu/packages/nano.scm: Delete file.
    * gnu/packages/text-editors.scm (nano): New variable.
    [copyright header]: Transfer copyright notices from nano.scm to 
text-editors.scm.
    
    Change-Id: I257f68a3072481f556db208bd1bd34e6eec79b47
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/local.mk                  |  1 -
 gnu/packages/nano.scm         | 51 -------------------------------------------
 gnu/packages/text-editors.scm | 26 +++++++++++++++++++++-
 3 files changed, 25 insertions(+), 53 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 8fe17d15ce..2896395120 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -455,7 +455,6 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/musl.scm                                \
   %D%/packages/mtools.scm                      \
   %D%/packages/myrddin.scm                     \
-  %D%/packages/nano.scm                                \
   %D%/packages/ncdu.scm                                \
   %D%/packages/ncurses.scm                     \
   %D%/packages/netpbm.scm                      \
diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm
deleted file mode 100644
index 0fd08f8031..0000000000
--- a/gnu/packages/nano.scm
+++ /dev/null
@@ -1,51 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2015-2022 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
-;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages nano)
-  #:use-module (guix licenses)
-  #:use-module (gnu packages gettext)
-  #:use-module (gnu packages ncurses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
-
-(define-public nano
-  (package
-    (name "nano")
-    (version "7.2")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
-      (sha256
-       (base32 "09j5gb44yiv18fvn0iy17jnl9d5lh3gkry4kqv776a5xd0kl9ww6"))))
-    (build-system gnu-build-system)
-    (inputs
-     (list gettext-minimal ncurses))
-    (home-page "https://www.nano-editor.org/";)
-    (synopsis "Small, user-friendly console text editor")
-    (description
-     "GNU nano is a small and simple text editor for use in a terminal.  
Besides
-basic editing, it supports: undo/redo, syntax highlighting, spell checking,
-justifying, auto-indentation, bracket matching, interactive search-and-replace
-(with regular expressions), and the editing of multiple files.")
-    (license gpl3+))) ; some files are under GPLv2+
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 2d89fcce59..1999d27540 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -1,9 +1,10 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015-2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
-;;; Copyright © 2016, 2019, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2017, 2018, 2020, 2022 Eric Bavier <bavier@posteo.net>
 ;;; Copyright © 2017 Feng Shu <tumashu@163.com>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
@@ -23,6 +24,7 @@
 ;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
 ;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
+;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2022 Andy Tai <atai@atai.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@gmail.com>
@@ -598,6 +600,28 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  
e3 can be used on
 OpenBSD team.")
     (license license:public-domain)))
 
+(define-public nano
+  (package
+    (name "nano")
+    (version "7.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
+      (sha256
+       (base32 "09j5gb44yiv18fvn0iy17jnl9d5lh3gkry4kqv776a5xd0kl9ww6"))))
+    (build-system gnu-build-system)
+    (inputs
+     (list gettext-minimal ncurses))
+    (home-page "https://www.nano-editor.org/";)
+    (synopsis "Small, user-friendly console text editor")
+    (description
+     "GNU nano is a small and simple text editor for use in a terminal.  
Besides
+basic editing, it supports: undo/redo, syntax highlighting, spell checking,
+justifying, auto-indentation, bracket matching, interactive search-and-replace
+(with regular expressions), and the editing of multiple files.")
+    (license license:gpl3+))) ; some files are under GPLv2+
+
 (define-public qemacs
   (package
     (name "qemacs")