gnu: Merge (gnu packages rush) into (gnu packages shells).

* gnu/packages/rush.scm (rush): Move from here ...
* gnu/packages/shells.scm (rush):  ... to here.
* gnu/packages/rush.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregister file.
* po/packages/POTFILES.in: Likewise.

Change-Id: I58029c20386e6bfd08f237c83a08235bfcbbc992
Reviewed-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

2 files changed, 22 insertions, 46 deletions

diff --git a/gnu/packages/rush.scm b/gnu/packages/rush.scm
deleted file mode 100644
index 393c2941d51..00000000000
--- a/gnu/packages/rush.scm
+++ /dev/null
@@ -1,46 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
-;;;
-;;; 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 rush)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix licenses)
-  #:use-module (gnu packages))
-
-(define-public rush
-  (package
-    (name "rush")
-    (version "2.4")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnu/rush/rush-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "1nqjjbamdn4lcysc2hji3i73jjl1ghivb24h12zh79xnka438vr6"))))
-    (build-system gnu-build-system)
-    (home-page "https://www.gnu.org/software/rush/")
-    (synopsis "Restricted user (login) shell")
-    (description
-     "GNU Rush is a restricted user shell, for systems on which users are to
-be provided with only limited functionality or resources.  Administrators set
-user rights via a configuration file which can be used to limit, for example,
-the commands that can be executed, CPU time, or virtual memory usage.")
-    (license gpl3+)))
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 64e53fc6e53..f286650adab 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
@@ -426,6 +427,27 @@ written by Paul Haahr and Byron Rakitzis.")
     (home-page "https://wryun.github.io/es-shell/")
     (license license:public-domain)))
 
+(define-public rush
+  (package
+    (name "rush")
+    (version "2.4")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/rush/rush-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1nqjjbamdn4lcysc2hji3i73jjl1ghivb24h12zh79xnka438vr6"))))
+    (build-system gnu-build-system)
+    (home-page "https://www.gnu.org/software/rush/")
+    (synopsis "Restricted user (login) shell")
+    (description
+     "GNU Rush is a restricted user shell, for systems on which users are to
+be provided with only limited functionality or resources.  Administrators set
+user rights via a configuration file which can be used to limit, for example,
+the commands that can be executed, CPU time, or virtual memory usage.")
+    (license license:gpl3+)))
+
 (define-public tcsh
   (package
     (name "tcsh")