guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/10: gnu: coreutils: Update to 8.30.


From: Marius Bakke
Subject: 05/10: gnu: coreutils: Update to 8.30.
Date: Sat, 25 Aug 2018 10:30:53 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit a8dcf6cec7c5ded4bd0967f00b9b502d7d66e5ef
Author: Marius Bakke <address@hidden>
Date:   Fri Aug 24 16:14:07 2018 +0200

    gnu: coreutils: Update to 8.30.
    
    * gnu/packages/base.scm (coreutils): Update to 8.30.
    [arguments]: Add phase to skip broken test.
---
 gnu/packages/base.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c073672..114413b 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -326,14 +326,14 @@ used to apply commands with arbitrarily long arguments.")
 (define-public coreutils
   (package
    (name "coreutils")
-   (version "8.29")
+   (version "8.30")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/coreutils/coreutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j"))))
+              "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"))))
    (build-system gnu-build-system)
    (inputs `(("acl"  ,acl)                        ; TODO: add SELinux
              ("gmp"  ,gmp)                        ;bignums in 'expr', yay!
@@ -364,7 +364,17 @@ used to apply commands with arbitrarily long arguments.")
                      (substitute* (find-files "gnulib-tests" "\\.c$")
                        (("/bin/sh") (which "sh")))
                      (substitute* (find-files "tests" "\\.sh$")
-                       (("#!/bin/sh") (which "sh")))
+                       (("#!/bin/sh") (string-append "#!" (which "sh"))))
+                     #t))
+                 (add-before 'check 'disable-broken-test
+                   (lambda _
+                     ;; This test hits the 127 character shebang limit in the 
build
+                     ;; environment due to the way "env -S" splits arguments 
into
+                     ;; shebangs.  Note that "env-S-script.sh" works around 
this
+                     ;; specific issue, but "env-S.pl" is not adjusted for 
build
+                     ;; environments with long prefixes (/tmp/guix-build-...).
+                     (substitute* "Makefile"
+                       (("^.*tests/misc/env-S.pl.*$") ""))
                      #t)))
 
       ;; Work around a cross-compilation bug whereby libcoreutils.a would



reply via email to

[Prev in Thread] Current Thread [Next in Thread]