unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 0/2] Tcsh update for core-updates
@ 2017-02-24  8:16 Leo Famulari
  2017-02-24  8:16 ` [PATCH 1/2] gnu: tcsh: Update to 6.20.00 Leo Famulari
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Leo Famulari @ 2017-02-24  8:16 UTC (permalink / raw)
  To: guix-devel

This updates tcsh to the latest upstream version.

Some of the previously disabled tests could be re-enabled after being
adjusted upstream.

The 'cdtohome' test is disabled since the Guix build user does not have
a home directory.

And one upstream change is cherry-picked to handle a change in sed.

Perl is added as a test dependency.

Leo Famulari (2):
  gnu: tcsh: Update to 6.20.00.
  gnu: tcsh: Use modify-phases.

 gnu/local.mk                                       |   1 -
 .../patches/tcsh-do-not-define-BSDWAIT.patch       |  33 ------
 gnu/packages/patches/tcsh-fix-autotest.patch       | 113 ++++++++++-----------
 gnu/packages/shells.scm                            |  60 ++++++-----
 4 files changed, 81 insertions(+), 126 deletions(-)
 delete mode 100644 gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch

-- 
2.11.1

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] gnu: tcsh: Update to 6.20.00.
  2017-02-24  8:16 [PATCH 0/2] Tcsh update for core-updates Leo Famulari
@ 2017-02-24  8:16 ` Leo Famulari
  2017-02-24  8:16 ` [PATCH 2/2] gnu: tcsh: Use modify-phases Leo Famulari
  2017-02-24  9:40 ` [PATCH 0/2] Tcsh update for core-updates ng0
  2 siblings, 0 replies; 7+ messages in thread
From: Leo Famulari @ 2017-02-24  8:16 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/shells.scm (tcsh): Update to 6.20.00.
[source]: Remove 'tcsh-do-not-define-BSDWAIT.patch'.
[inputs]: Remove coreutils. Move autoconf to ...
[native-inputs]: ... here. Add perl.
* gnu/packages/patches/tcsh-fix-autotest.patch: Adjust patch to upstream
changes.
* gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |   1 -
 .../patches/tcsh-do-not-define-BSDWAIT.patch       |  33 ------
 gnu/packages/patches/tcsh-fix-autotest.patch       | 113 ++++++++++-----------
 gnu/packages/shells.scm                            |  12 +--
 4 files changed, 58 insertions(+), 101 deletions(-)
 delete mode 100644 gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d7c7ed347..ec9332271 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -918,7 +918,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/tar-skip-unreliable-tests.patch		\
   %D%/packages/patches/tcl-mkindex-deterministic.patch		\
   %D%/packages/patches/tclxml-3.2-install.patch			\
-  %D%/packages/patches/tcsh-do-not-define-BSDWAIT.patch		\
   %D%/packages/patches/tcsh-fix-autotest.patch			\
   %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch	\
   %D%/packages/patches/teensy-loader-cli-help.patch		\
diff --git a/gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch b/gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch
deleted file mode 100644
index 142688321..000000000
--- a/gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Do not define BSDWAIT to avoid error "storage size of ‘w’ isn’t known".
-
-This is an adapted version of the upstream patch taken from here:
-https://github.com/tcsh-org/tcsh/commit/4689eb60a74bf13bc146ca3d76e9d7a124ab7b49.patch
-
-From 4689eb60a74bf13bc146ca3d76e9d7a124ab7b49 Mon Sep 17 00:00:00 2001
-From: christos <christos>
-Date: Fri, 23 Sep 2016 19:17:28 +0000
-Subject: [PATCH] Don't define BSDWAIT for linux anymore.
-
----
- sh.proc.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/sh.proc.c b/sh.proc.c
-index 49b199f..874d67c 100644
---- sh.proc.c
-+++ sh.proc.c
-@@ -47,11 +47,9 @@ RCSID("$tcsh$")
- # define HZ 16
- #endif /* aiws */
- 
--#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
--# if !defined(__ANDROID__)
--#  define BSDWAIT
--# endif
--#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
-+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid)
-+# define BSDWAIT
-+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid */
- #ifndef WTERMSIG
- # define WTERMSIG(w)	(((union wait *) &(w))->w_termsig)
- # ifndef BSDWAIT
diff --git a/gnu/packages/patches/tcsh-fix-autotest.patch b/gnu/packages/patches/tcsh-fix-autotest.patch
index a16980161..78444a1b2 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
++++ tests/commands.at
+@@ -921,26 +921,27 @@ AT_CLEANUP
  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
++++ tests/lexical.at
+@@ -35,9 +35,9 @@ AT_CHECK([if [ ! -t 0 ]; then exit 77; fi],, [Skipping comment tests])
  AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK
  ])
  
@@ -81,9 +63,33 @@
  
  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 @@
+@@ -567,10 +567,10 @@ run=3
+# Adapt to changes in sed 4.3:
+# https://github.com/tcsh-org/tcsh/commit/2ad4fc1705893207598ed5cd21713ddf3f17bba0
+ ]])
+ AT_DATA([uniformity_test.csh],
+ [[
+-set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
++set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
+ echo -n "$SERVICE_NAME_LOG" > ./output1
+ 
+-cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
++cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
+ 
+ diff -uprN ./output1 ./output2 >& /dev/null
+ 
+@@ -587,7 +587,7 @@ AT_DATA([quoting_result_test.csh],
+ echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result
+ 
+ set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))"
+-set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
++set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
+ 
+ echo "$SERVICE_NAME_LOG" > ./actual_result
+ 
+--- tests/subst.at
++++ tests/subst.at
+@@ -54,7 +54,7 @@ AT_CHECK([echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'],
  , [1
  ])
  
@@ -92,39 +98,9 @@
  	  | 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 @@
+--- tests/variables.at
++++ tests/variables.at
+@@ -666,7 +666,8 @@ set listflags=(-xA $cwd/args.sh)
  ls-F -something .
  ]])
  AT_DATA([args.sh],
@@ -134,7 +110,22 @@
  ]])
  chmod a+x args.sh
  AT_CHECK([tcsh -f listflags.csh], ,
-@@ -695,55 +697,57 @@
+@@ -704,9 +705,9 @@ AT_CHECK([tcsh -f mail.csh], ,
+# This test fails by trying to change to the build user's home
+# directory, which does not exist.
+ AT_CLEANUP
+ 
+ 
+-AT_SETUP([$ cdtohome])
+-AT_CHECK([tcsh -f -c 'cd'], 0)
+-AT_CLEANUP
++#AT_SETUP([$ cdtohome])
++#AT_CHECK([tcsh -f -c 'cd'], 0)
++#AT_CLEANUP
+ AT_SETUP([$ noimplicithome])
+ AT_CHECK([tcsh -f -c 'unset cdtohome; cd'], 1, , [cd: Too few arguments.
+ ])
+@@ -728,55 +729,57 @@ TCSH_UNTESTED([$ oid])
  AT_SETUP([$ owd])
  
  AT_DATA([owd.csh],
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index cc3968f9b..d9e0f93a1 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -218,7 +218,7 @@ written by Paul Haahr and Byron Rakitzis.")
 (define-public tcsh
   (package
     (name "tcsh")
-    (version "6.18.01")
+    (version "6.20.00")
     (source (origin
               (method url-fetch)
               ;; Old tarballs are moved to old/.
@@ -228,16 +228,16 @@ written by Paul Haahr and Byron Rakitzis.")
                                         "old/tcsh-" version ".tar.gz")))
               (sha256
                (base32
-                "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q"))
+                "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq"))
               (patches (search-patches "tcsh-fix-autotest.patch"
-                                       "tcsh-do-not-define-BSDWAIT.patch"
                                        "tcsh-fix-out-of-bounds-read.patch"))
               (patch-flags '("-p0"))))
     (build-system gnu-build-system)
-    (inputs
+    (native-inputs
      `(("autoconf" ,autoconf)
-       ("coreutils" ,coreutils)
-       ("ncurses" ,ncurses)))
+       ("perl" ,perl)))
+    (inputs
+     `(("ncurses" ,ncurses)))
     (arguments
      `(#:phases
        (alist-cons-before
-- 
2.11.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] gnu: tcsh: Use modify-phases.
  2017-02-24  8:16 [PATCH 0/2] Tcsh update for core-updates Leo Famulari
  2017-02-24  8:16 ` [PATCH 1/2] gnu: tcsh: Update to 6.20.00 Leo Famulari
@ 2017-02-24  8:16 ` Leo Famulari
  2017-02-24 10:46   ` Marius Bakke
  2017-02-24  9:40 ` [PATCH 0/2] Tcsh update for core-updates ng0
  2 siblings, 1 reply; 7+ messages in thread
From: Leo Famulari @ 2017-02-24  8:16 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/shells.scm (tcsh)[arguments]: Use modify-phases.
---
 gnu/packages/shells.scm | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index d9e0f93a1..ef5ed8040 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -240,32 +240,30 @@ written by Paul Haahr and Byron Rakitzis.")
      `(("ncurses" ,ncurses)))
     (arguments
      `(#:phases
-       (alist-cons-before
-        'check 'patch-test-scripts
-        (lambda _
-          ;; Take care of pwd
-          (substitute* '("tests/commands.at" "tests/variables.at")
-            (("/bin/pwd") (which "pwd")))
-          ;; The .at files create shell scripts without shebangs. Erk.
-          (substitute* "tests/commands.at"
-            (("./output.sh") "/bin/sh output.sh"))
-          (substitute* "tests/syntax.at"
-            (("; other_script.csh") "; /bin/sh other_script.csh"))
-          ;; Now, let's generate the test suite and patch it
-          (system* "make" "tests/testsuite")
+        (modify-phases %standard-phases
+          (add-before 'check 'patch-test-scripts
+            (lambda _
+              ;; Take care of pwd
+              (substitute* '("tests/commands.at" "tests/variables.at")
+                (("/bin/pwd") (which "pwd")))
+              ;; The .at files create shell scripts without shebangs. Erk.
+              (substitute* "tests/commands.at"
+                (("./output.sh") "/bin/sh output.sh"))
+              (substitute* "tests/syntax.at"
+                (("; other_script.csh") "; /bin/sh other_script.csh"))
+              ;; Now, let's generate the test suite and patch it
+              (system* "make" "tests/testsuite")
 
-          ;; This file is ISO-8859-1 encoded.
-          (with-fluids ((%default-port-encoding #f))
-            (substitute* "tests/testsuite"
-              (("/bin/sh") (which "sh")))))
-        (alist-cons-after
-         'install 'post-install
-         (lambda* (#:key inputs outputs #:allow-other-keys)
-          (let* ((out (assoc-ref %outputs "out"))
-                 (bin (string-append out "/bin")))
-           (with-directory-excursion bin
-             (symlink "tcsh" "csh"))))
-         %standard-phases))))
+              ;; This file is ISO-8859-1 encoded.
+              (with-fluids ((%default-port-encoding #f))
+                (substitute* "tests/testsuite"
+                  (("/bin/sh") (which "sh"))))))
+          (add-after 'install 'post-install
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref %outputs "out"))
+                     (bin (string-append out "/bin")))
+                (with-directory-excursion bin
+                  (symlink "tcsh" "csh"))))))))
     (home-page "http://www.tcsh.org/")
     (synopsis "Unix shell based on csh")
     (description
-- 
2.11.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] Tcsh update for core-updates
  2017-02-24  8:16 [PATCH 0/2] Tcsh update for core-updates Leo Famulari
  2017-02-24  8:16 ` [PATCH 1/2] gnu: tcsh: Update to 6.20.00 Leo Famulari
  2017-02-24  8:16 ` [PATCH 2/2] gnu: tcsh: Use modify-phases Leo Famulari
@ 2017-02-24  9:40 ` ng0
  2017-02-24 16:55   ` Leo Famulari
  2 siblings, 1 reply; 7+ messages in thread
From: ng0 @ 2017-02-24  9:40 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

On 17-02-24 03:16:43, Leo Famulari wrote:
> This updates tcsh to the latest upstream version.
> 
> Some of the previously disabled tests could be re-enabled after being
> adjusted upstream.
> 
> The 'cdtohome' test is disabled since the Guix build user does not have
> a home directory.

Hi,

some weeks ago I worked on this. Put a significant amount of time into
the update, waited for replies and asked upstream about the cdhome
issue as I don't understand tcsh syntax that much.
This is exactly why I don't think email is the perfect tool for project
work. There is no reminder to tell you someone already worked on this,
no interactive search unless you have it yourself.
It would be good if you could search the archive next time and tell me
to rebase or redo it on core-updates.

> And one upstream change is cherry-picked to handle a change in sed.
> 
> Perl is added as a test dependency.
> 
> Leo Famulari (2):
>   gnu: tcsh: Update to 6.20.00.
>   gnu: tcsh: Use modify-phases.
> 
>  gnu/local.mk                                       |   1 -
>  .../patches/tcsh-do-not-define-BSDWAIT.patch       |  33 ------
>  gnu/packages/patches/tcsh-fix-autotest.patch       | 113 ++++++++++-----------
>  gnu/packages/shells.scm                            |  60 ++++++-----
>  4 files changed, 81 insertions(+), 126 deletions(-)
>  delete mode 100644 gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch
> 
> -- 
> 2.11.1
> 
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] gnu: tcsh: Use modify-phases.
  2017-02-24  8:16 ` [PATCH 2/2] gnu: tcsh: Use modify-phases Leo Famulari
@ 2017-02-24 10:46   ` Marius Bakke
  0 siblings, 0 replies; 7+ messages in thread
From: Marius Bakke @ 2017-02-24 10:46 UTC (permalink / raw)
  To: Leo Famulari, guix-devel

[-- Attachment #1: Type: text/plain, Size: 3357 bytes --]


Hi Leo, thanks for this update!

The patch looks good, but please add a #t at the end of the
'patch-test-scripts' and 'post-install' phases with the second commit.

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/shells.scm (tcsh)[arguments]: Use modify-phases.
> ---
>  gnu/packages/shells.scm | 48 +++++++++++++++++++++++-------------------------
>  1 file changed, 23 insertions(+), 25 deletions(-)
>
> diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
> index d9e0f93a1..ef5ed8040 100644
> --- a/gnu/packages/shells.scm
> +++ b/gnu/packages/shells.scm
> @@ -240,32 +240,30 @@ written by Paul Haahr and Byron Rakitzis.")
>       `(("ncurses" ,ncurses)))
>      (arguments
>       `(#:phases
> -       (alist-cons-before
> -        'check 'patch-test-scripts
> -        (lambda _
> -          ;; Take care of pwd
> -          (substitute* '("tests/commands.at" "tests/variables.at")
> -            (("/bin/pwd") (which "pwd")))
> -          ;; The .at files create shell scripts without shebangs. Erk.
> -          (substitute* "tests/commands.at"
> -            (("./output.sh") "/bin/sh output.sh"))
> -          (substitute* "tests/syntax.at"
> -            (("; other_script.csh") "; /bin/sh other_script.csh"))
> -          ;; Now, let's generate the test suite and patch it
> -          (system* "make" "tests/testsuite")
> +        (modify-phases %standard-phases
> +          (add-before 'check 'patch-test-scripts
> +            (lambda _
> +              ;; Take care of pwd
> +              (substitute* '("tests/commands.at" "tests/variables.at")
> +                (("/bin/pwd") (which "pwd")))
> +              ;; The .at files create shell scripts without shebangs. Erk.
> +              (substitute* "tests/commands.at"
> +                (("./output.sh") "/bin/sh output.sh"))
> +              (substitute* "tests/syntax.at"
> +                (("; other_script.csh") "; /bin/sh other_script.csh"))
> +              ;; Now, let's generate the test suite and patch it
> +              (system* "make" "tests/testsuite")
>  
> -          ;; This file is ISO-8859-1 encoded.
> -          (with-fluids ((%default-port-encoding #f))
> -            (substitute* "tests/testsuite"
> -              (("/bin/sh") (which "sh")))))
> -        (alist-cons-after
> -         'install 'post-install
> -         (lambda* (#:key inputs outputs #:allow-other-keys)
> -          (let* ((out (assoc-ref %outputs "out"))
> -                 (bin (string-append out "/bin")))
> -           (with-directory-excursion bin
> -             (symlink "tcsh" "csh"))))
> -         %standard-phases))))
> +              ;; This file is ISO-8859-1 encoded.
> +              (with-fluids ((%default-port-encoding #f))
> +                (substitute* "tests/testsuite"
> +                  (("/bin/sh") (which "sh"))))))
> +          (add-after 'install 'post-install
> +            (lambda* (#:key inputs outputs #:allow-other-keys)
> +              (let* ((out (assoc-ref %outputs "out"))
> +                     (bin (string-append out "/bin")))
> +                (with-directory-excursion bin
> +                  (symlink "tcsh" "csh"))))))))
>      (home-page "http://www.tcsh.org/")
>      (synopsis "Unix shell based on csh")
>      (description
> -- 
> 2.11.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] Tcsh update for core-updates
  2017-02-24  9:40 ` [PATCH 0/2] Tcsh update for core-updates ng0
@ 2017-02-24 16:55   ` Leo Famulari
  2017-02-24 17:28     ` ng0
  0 siblings, 1 reply; 7+ messages in thread
From: Leo Famulari @ 2017-02-24 16:55 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]

On Fri, Feb 24, 2017 at 09:40:38AM +0000, ng0 wrote:
> On 17-02-24 03:16:43, Leo Famulari wrote:
> > This updates tcsh to the latest upstream version.
> 
> some weeks ago I worked on this. Put a significant amount of time into
> the update, waited for replies and asked upstream about the cdhome
> issue as I don't understand tcsh syntax that much.
> This is exactly why I don't think email is the perfect tool for project
> work. There is no reminder to tell you someone already worked on this,
> no interactive search unless you have it yourself.
> It would be good if you could search the archive next time and tell me
> to rebase or redo it on core-updates.

I understand that is frustrating, but I did read that discussion before
starting to work on my patch. Also, Tobias worked on it last August.

In both cases, there were some questions about the changes, and then the
patch authors stopped working on the patch. Now, tcsh is blocking
core-updates, so I decided to try updating tcsh.

It's hard to take a pre-existing patch from somebody else and try to
figure out what parts are necessary, which parts can be discarded, which
parts should be adjusted, et cetera. Especially for a complicated
package update that requires adjusting patch files.

It's a lot easier to try the upgrade from scratch and fix problems as I
find them.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] Tcsh update for core-updates
  2017-02-24 16:55   ` Leo Famulari
@ 2017-02-24 17:28     ` ng0
  0 siblings, 0 replies; 7+ messages in thread
From: ng0 @ 2017-02-24 17:28 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

On 17-02-24 11:55:11, Leo Famulari wrote:
> On Fri, Feb 24, 2017 at 09:40:38AM +0000, ng0 wrote:
> > On 17-02-24 03:16:43, Leo Famulari wrote:
> > > This updates tcsh to the latest upstream version.
> > 
> > some weeks ago I worked on this. Put a significant amount of time into
> > the update, waited for replies and asked upstream about the cdhome
> > issue as I don't understand tcsh syntax that much.
> > This is exactly why I don't think email is the perfect tool for project
> > work. There is no reminder to tell you someone already worked on this,
> > no interactive search unless you have it yourself.
> > It would be good if you could search the archive next time and tell me
> > to rebase or redo it on core-updates.
> 
> I understand that is frustrating, but I did read that discussion before
> starting to work on my patch. Also, Tobias worked on it last August.

Okay, I didn't find Tobias work either*, so blame on me too. My initial
reaction was frustration though.
(* or did I? It's too long since I worked on tcsh)
There were no updates as I waited for someone more knowledgable in the
tcsh language than myself - either upstream (where I didn't get much
help) or within our community. None of that happened and the work I did
which wasn't updated was just synced to my git.

> In both cases, there were some questions about the changes, and then the
> patch authors stopped working on the patch. Now, tcsh is blocking
> core-updates, so I decided to try updating tcsh.

Okay, that's something I wasn't involved with so I didn't know. Thanks
for letting me know.

> It's hard to take a pre-existing patch from somebody else and try to
> figure out what parts are necessary, which parts can be discarded, which
> parts should be adjusted, et cetera. Especially for a complicated
> package update that requires adjusting patch files.
> 
> It's a lot easier to try the upgrade from scratch and fix problems as I
> find them.

I agree with this to some degree. Sometimes fixing the patch works, but
sometimes it just doesn't. I've encountered the case where it didn't
help anymore when I started working on git-shallow-clone by Andy from 2
years ago.


Anyway, no harm done, I just wanted to express what I felt.
What counts is that we don't start bulldozer'ing over each others work
and that the problem is fixed in the end.

Wether both Tobias and my work helped you or not, Thanks for fixing the
long overdue tcsh update :)

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-02-24 17:26 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-24  8:16 [PATCH 0/2] Tcsh update for core-updates Leo Famulari
2017-02-24  8:16 ` [PATCH 1/2] gnu: tcsh: Update to 6.20.00 Leo Famulari
2017-02-24  8:16 ` [PATCH 2/2] gnu: tcsh: Use modify-phases Leo Famulari
2017-02-24 10:46   ` Marius Bakke
2017-02-24  9:40 ` [PATCH 0/2] Tcsh update for core-updates ng0
2017-02-24 16:55   ` Leo Famulari
2017-02-24 17:28     ` ng0

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).