4 files changed, 22 insertions(+), 48 deletions(-)

M gnu/local.mk
D gnu/packages/rush.scm
M gnu/packages/shells.scm
M po/packages/POTFILES.in

@@ 604,7 604,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/ruby.scm				\
   %D%/packages/ruby-check.scm				\
   %D%/packages/ruby-xyz.scm				\
-  %D%/packages/rush.scm				\
   %D%/packages/rust.scm				\
   %D%/packages/rust-apps.scm			\
   %D%/packages/rust-crates.scm			\

@@ 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+)))

@@ 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")

@@ 499,7 499,6 @@ gnu/packages/re2c.scm
 gnu/packages/rsync.scm
 gnu/packages/ruby-check.scm
 gnu/packages/ruby.scm
-gnu/packages/rush.scm
 gnu/packages/rust.scm
 gnu/packages/samba.scm
 gnu/packages/scribus.scm