From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH] gnu: tcsh: Update to 6.20.00. Date: Mon, 9 Jan 2017 00:25:01 +0000 Message-ID: <20170109002501.24697-2-ng0@libertad.pw> References: <20170109002501.24697-1-ng0@libertad.pw> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQNlI-0007l0-30 for guix-devel@gnu.org; Sun, 08 Jan 2017 19:24:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cQNlG-0002y1-9z for guix-devel@gnu.org; Sun, 08 Jan 2017 19:24:32 -0500 Received: from aibo.runbox.com ([91.220.196.211]:52774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cQNlG-0002xF-1r for guix-devel@gnu.org; Sun, 08 Jan 2017 19:24:30 -0500 Received: from [10.9.9.212] (helo=mailfront12.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1cQNlE-00027I-Sz for guix-devel@gnu.org; Mon, 09 Jan 2017 01:24:28 +0100 In-Reply-To: <20170109002501.24697-1-ng0@libertad.pw> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/shells.scm (tcsh): Update to 6.20.00. [native-inputs]: Add perl. * gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Remove it. --- gnu/packages/patches/tcsh-fix-autotest.patch | 151 ++------------------------- gnu/packages/shells.scm | 10 +- 2 files changed, 15 insertions(+), 146 deletions(-) diff --git a/gnu/packages/patches/tcsh-fix-autotest.patch b/gnu/packages/patches/tcsh-fix-autotest.patch index a16980161..555b9151b 100644 --- a/gnu/packages/patches/tcsh-fix-autotest.patch +++ b/gnu/packages/patches/tcsh-fix-autotest.patch @@ -1,6 +1,6 @@ ---- tests/commands.at 2011-01-22 01:04:02.000000000 +0100 -+++ tests/commands.at 2013-02-04 10:57:24.000000000 +0100 -@@ -919,26 +919,27 @@ +--- tests/commands.at 2016-07-09 00:49:28.000000000 +0000 ++++ tests/commands.at 2017-01-08 22:07:46.848337902 +0000 +@@ -921,26 +921,27 @@ TCSH_UNTESTED([notify]) @@ -48,27 +48,9 @@ AT_SETUP([popd]) -@@ -1203,11 +1204,12 @@ - AT_DATA([script.csh], - [[set var=$1 - ]]) --AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \ -- | sed 's/ [^ ]* / TIME /']], , --[ 1 TIME source -h script.csh foo ; history -- 2 TIME set var=$1 --]) -+# XXX: Not sure why this fails. The output is : "1 TIME set var=$1" -+#AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \ -+# | sed 's/ [^ ]* / TIME /']], , -+#[ 1 TIME source -h script.csh foo ; history -+# 2 TIME set var=$1 -+#]) - - AT_CHECK([tcsh -f -c 'source -h script.csh foo; echo $var'], 1, [], - [var: Undefined variable. ---- tests/lexical.at 2011-12-27 22:50:52.000000000 +0100 -+++ tests/lexical.at 2013-02-04 10:53:21.000000000 +0100 -@@ -33,9 +33,9 @@ +--- tests/lexical.at 2016-05-27 18:10:15.000000000 +0000 ++++ tests/lexical.at 2017-01-08 22:12:13.221658776 +0000 +@@ -35,9 +35,9 @@ AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK ]) @@ -81,60 +63,9 @@ AT_DATA([comment2.csh], [[echo testing...@%:@\ ---- tests/subst.at 2011-12-27 22:50:52.000000000 +0100 -+++ tests/subst.at 2013-02-01 08:14:25.000000000 +0100 -@@ -54,7 +54,7 @@ - , [1 - ]) - --AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq dnl -+AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | grep -v "/homeless-shelter" | uniq dnl - | wc -l | tr -d ' \t'], , [1 - ]) - ---- tests/variables.at 2011-12-27 22:50:52.000000000 +0100 -+++ tests/variables.at 2013-02-04 11:40:35.000000000 +0100 -@@ -317,17 +317,18 @@ - AT_CLEANUP - - --AT_SETUP([$ edit]) -- --AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], , --[1 --]) -- --AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], , --[0 --]) -- --AT_CLEANUP -+# XXX -+#AT_SETUP([$ edit]) -+# -+#AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], , -+#[1 -+#]) -+# -+#AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], , -+#[0 -+#]) -+# -+#AT_CLEANUP - - - AT_SETUP([$ ellipsis]) -@@ -642,7 +643,8 @@ - ls-F -something . - ]]) - AT_DATA([args.sh], --[[echo "$@" -+[[#!/bin/sh -+echo "$@" - ]]) - chmod a+x args.sh - AT_CHECK([tcsh -f listflags.csh], , -@@ -695,55 +697,57 @@ +--- tests/variables.at 2016-09-12 16:33:54.000000000 +0000 ++++ tests/variables.at 2017-01-08 22:34:56.300417919 +0000 +@@ -728,21 +728,22 @@ AT_SETUP([$ owd]) AT_DATA([owd.csh], @@ -165,67 +96,3 @@ ]) AT_CLEANUP - - --AT_SETUP([$ path]) -- --mkdir subdir --AT_DATA([script.sh], --[[echo home --]]) --AT_DATA([subdir/script.sh], --[[echo subdir --]]) --chmod a+x script.sh subdir/script.sh --AT_DATA([path.csh], --[[echo $?path --set path=(. subdir) --script.sh --set path=(subdir .) --script.sh --printenv PATH --setenv PATH :foo::bar: --echo $path --]]) --AT_CHECK([tcsh -f path.csh], , --[1 --home --subdir --subdir:. --. foo . bar . --]) -- --AT_CLEANUP -+# XXX Not sure why this does not work. "home" is printed out twice on stdout. -+#AT_SETUP([$ path]) -+# -+#mkdir subdir -+#AT_DATA([script.sh], -+#[[echo home -+#]]) -+#AT_DATA([subdir/script.sh], -+#[[echo subdir -+#]]) -+#chmod a+x script.sh subdir/script.sh -+#AT_DATA([path.csh], -+#[[echo $?path -+#set path=(. subdir) -+#script.sh -+#set path=(subdir .) -+#script.sh -+#printenv PATH -+#setenv PATH :foo::bar: -+#echo $path -+#]]) -+#AT_CHECK([tcsh -f path.csh], , -+#[1 -+#home -+#subdir -+#subdir:. -+#. foo . bar . -+#]) -+# -+#AT_CLEANUP - - - AT_SETUP([$ printexitvalue]) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 960cb1f2a..1aee7f54c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -176,7 +177,7 @@ has a small feature set similar to a traditional Bourne shell.") (package (name "tcsh") (replacement tcsh/fixed) - (version "6.18.01") + (version "6.20.00") (source (origin (method url-fetch) ;; Old tarballs are moved to old/. @@ -186,15 +187,16 @@ has a small feature set similar to a traditional Bourne shell.") "old/tcsh-" version ".tar.gz"))) (sha256 (base32 - "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q")) - (patches (search-patches "tcsh-fix-autotest.patch" - "tcsh-do-not-define-BSDWAIT.patch")) + "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq")) + (patches (search-patches "tcsh-fix-autotest.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (inputs `(("autoconf" ,autoconf) ("coreutils" ,coreutils) ("ncurses" ,ncurses))) + (native-inputs + `(("perl" ,perl))) ; Used by test 122. (arguments `(#:phases (alist-cons-before -- 2.11.0