ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rc: Move to shells.scm.

Browse source 
* gnu/packages/rc.scm (rc): Move from here ...
* gnu/packages/shells.scm (rc): ... to here.
* gnu/packages/rc.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Remove rc.scm.
This commit is contained in:
Tobias Geerinckx-Rice 2016-08-03 00:22:08 +02:00
parent 618977ae38
commit 9a57d3e6a1
No known key found for this signature in database
GPG key ID: 91CCDB9B48541B99
3 changed files with 51 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -291,7 +291,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/ragel.scm \ %D%/packages/ragel.scm \
%D%/packages/rails.scm \ %D%/packages/rails.scm \
%D%/packages/ratpoison.scm \ %D%/packages/ratpoison.scm \
%D%/packages/rc.scm \
%D%/packages/rdesktop.scm \ %D%/packages/rdesktop.scm \
%D%/packages/rdf.scm \ %D%/packages/rdf.scm \
%D%/packages/readline.scm \ %D%/packages/readline.scm \

72
gnu/packages/rc.scm
View file

@ -1,72 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;;
;;; 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 rc)
#:use-module (gnu packages autotools)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages readline)
#:use-module (guix build-system gnu)
#:use-module (guix git-download)
#:use-module (guix licenses)
#:use-module (guix packages))
(define-public rc
(package
(name "rc")
(version "1.7.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://github.com/rakitzis/rc.git")
;; commit name 'release: rc-1.7.4'
(commit "c884da53a7c885d46ace2b92de78946855b18e92")))
(sha256
(base32
"00mgzvrrh9w96xa85g4gjbsvq02f08k4jwjcdnxq7kyh5xgiw95l"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
'("--with-edit=gnu")
#:phases
(modify-phases %standard-phases
(add-after
'unpack 'autoreconf
(lambda _ (zero? (system* "autoreconf" "-vfi"))))
(add-before
'autoreconf 'patch-trip.rc
(lambda _
(substitute* "trip.rc"
(("/bin/pwd") (which "pwd"))
(("/bin/sh") (which "sh"))
(("/bin/rm") (which "rm"))
(("/bin\\)") (string-append (dirname (which "rm")) ")")))
#t)))))
(inputs `(("readline" ,readline)
("perl" ,perl)))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(synopsis "Alternative implementation of the rc shell by Byron Rakitzis")
(description
"This is a reimplementation by Byron Rakitzis of the Plan 9 shell. It
has a small feature set similar to a traditional Bourne shell.")
(home-page "http://github.com/rakitzis/rc")
(license zlib)))

51
gnu/packages/shells.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -18,12 +19,17 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages shells) (define-module (gnu packages shells)
#:use-module (gnu packages autotools)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages)) #:use-module (guix packages))
@ -100,3 +106,48 @@ (define-public fish
highlighting.") highlighting.")
(home-page "https://fishshell.com/") (home-page "https://fishshell.com/")
(license gpl2))) (license gpl2)))
(define-public rc
(package
(name "rc")
(version "1.7.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://github.com/rakitzis/rc.git")
;; commit name 'release: rc-1.7.4'
(commit "c884da53a7c885d46ace2b92de78946855b18e92")))
(sha256
(base32
"00mgzvrrh9w96xa85g4gjbsvq02f08k4jwjcdnxq7kyh5xgiw95l"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
'("--with-edit=gnu")
#:phases
(modify-phases %standard-phases
(add-after
'unpack 'autoreconf
(lambda _ (zero? (system* "autoreconf" "-vfi"))))
(add-before
'autoreconf 'patch-trip.rc
(lambda _
(substitute* "trip.rc"
(("/bin/pwd") (which "pwd"))
(("/bin/sh") (which "sh"))
(("/bin/rm") (which "rm"))
(("/bin\\)") (string-append (dirname (which "rm")) ")")))
#t)))))
(inputs `(("readline" ,readline)
("perl" ,perl)))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(synopsis "Alternative implementation of the rc shell by Byron Rakitzis")
(description
"This is a reimplementation by Byron Rakitzis of the Plan 9 shell. It
has a small feature set similar to a traditional Bourne shell.")
(home-page "http://github.com/rakitzis/rc")
(license zlib)))