nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "gnu: zsh: Move to shells.scm." 

This reverts commit 12b63ab505.
This commit is contained in:
Mark H Weaver 2016-08-04 08:16:27 -04:00
parent 4541ca986d
commit 5b098cc4b9
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
3 changed files with 82 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -369,6 +369,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/yubico.scm \ %D%/packages/yubico.scm \
%D%/packages/zile.scm \ %D%/packages/zile.scm \
%D%/packages/zip.scm \ %D%/packages/zip.scm \
%D%/packages/zsh.scm \
\ \
%D%/services.scm \ %D%/services.scm \
%D%/services/avahi.scm \ %D%/services/avahi.scm \

56
gnu/packages/shells.scm
View File

@ -1,7 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net> ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
@ -27,7 +26,6 @@
#: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 pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -215,57 +213,3 @@ interactive login shell and a shell script command processor. It includes a
command-line editor, programmable word completion, spelling correction, a command-line editor, programmable word completion, spelling correction, a
history mechanism, job control and a C-like syntax.") history mechanism, job control and a C-like syntax.")
(license bsd-4))) (license bsd-4)))
(define-public zsh
(package
(name "zsh")
(version "5.2")
(source (origin
(method url-fetch)
(uri (list (string-append
"http://www.zsh.org/pub/zsh-" version
".tar.gz")
(string-append
"http://www.zsh.org/pub/old/zsh-" version
".tar.gz")))
(sha256
(base32
"0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"))))
(build-system gnu-build-system)
(arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre")
#:phases (alist-cons-before
'configure 'fix-sh
(lambda _
;; Some of the files are ISO-8859-1 encoded.
(with-fluids ((%default-port-encoding #f))
(substitute*
'("configure"
"configure.ac"
"Src/exec.c"
"Src/mkmakemod.sh"
"Config/installfns.sh"
"Config/defs.mk.in"
"Test/E01options.ztst"
"Test/A05execution.ztst"
"Test/A01grammar.ztst"
"Test/A06assign.ztst"
"Test/B02typeset.ztst"
"Completion/Unix/Command/_init_d"
"Util/preconfig")
(("/bin/sh") (which "sh")))))
%standard-phases)))
(native-inputs `(("autoconf" ,autoconf)))
(inputs `(("ncurses" ,ncurses)
("pcre" ,pcre)
("perl" ,perl)))
(synopsis "Powerful shell for interactive use and scripting")
(description "The Z shell (zsh) is a Unix shell that can be used
as an interactive login shell and as a powerful command interpreter
for shell scripting. Zsh can be thought of as an extended Bourne shell
with a large number of improvements, including some features of bash,
ksh, and tcsh.")
(home-page "http://www.zsh.org/")
;; The whole thing is under an MIT/X11-style license, but there's one
;; command, 'Completion/Unix/Command/_darcs', which is under GPLv2+.
(license gpl2+)))

81
gnu/packages/zsh.scm Normal file
View File

@ -0,0 +1,81 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.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 zsh)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pcre)
#:use-module (gnu packages autotools)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses))
(define-public zsh
(package
(name "zsh")
(version "5.2")
(source (origin
(method url-fetch)
(uri (list (string-append
"http://www.zsh.org/pub/zsh-" version
".tar.gz")
(string-append
"http://www.zsh.org/pub/old/zsh-" version
".tar.gz")))
(sha256
(base32
"0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"))))
(build-system gnu-build-system)
(arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre")
#:phases (alist-cons-before
'configure 'fix-sh
(lambda _
;; Some of the files are ISO-8859-1 encoded.
(with-fluids ((%default-port-encoding #f))
(substitute*
'("configure"
"configure.ac"
"Src/exec.c"
"Src/mkmakemod.sh"
"Config/installfns.sh"
"Config/defs.mk.in"
"Test/E01options.ztst"
"Test/A05execution.ztst"
"Test/A01grammar.ztst"
"Test/A06assign.ztst"
"Test/B02typeset.ztst"
"Completion/Unix/Command/_init_d"
"Util/preconfig")
(("/bin/sh") (which "sh")))))
%standard-phases)))
(native-inputs `(("autoconf" ,autoconf)))
(inputs `(("ncurses" ,ncurses)
("pcre" ,pcre)
("perl" ,perl)))
(synopsis "Powerful shell for interactive use and scripting")
(description "The Z shell (zsh) is a Unix shell that can be used
as an interactive login shell and as a powerful command interpreter
for shell scripting. Zsh can be thought of as an extended Bourne shell
with a large number of improvements, including some features of bash,
ksh, and tcsh.")
(home-page "http://www.zsh.org/")
;; The whole thing is under an MIT/X11-style license, but there's one
;; command, 'Completion/Unix/Command/_darcs', which is under GPLv2+.
(license gpl2+)))