summary refs log tree commit diff
path: root/gnu/packages/base.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-05-17 10:46:26 +0200
committerLudovic Courtès <ludo@gnu.org>2016-05-17 10:46:26 +0200
commit74d637397b44a90d2dbc2ac100b38591dd4f81eb (patch)
treecb97e5bc7cc67b0c7a5bdfe1f6bc6b418244e3d1 /gnu/packages/base.scm
parent2135d1eb3faa061bcdceaf174bba4334770d44d4 (diff)
downloadguix-74d637397b44a90d2dbc2ac100b38591dd4f81eb.tar.gz
gnu: tar: Update to 1.29.
* gnu/packages/base.scm (tar): Update to 1.29.
[source]: Remove 'tar-d_ino_in_dirent-fix.patch'.
[arguments]: New field.
* gnu/packages/patches/tar-d_ino_in_dirent-fix.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/base.scm')
-rw-r--r--gnu/packages/base.scm18
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 0d12376057..f5da787d6b 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -137,17 +137,27 @@ implementation offers several extensions over the standard utility.")
 (define-public tar
   (package
    (name "tar")
-   (version "1.28")
+   (version "1.29")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/tar/tar-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4"))
-            (patches (search-patches "tar-d_ino_in_dirent-fix.patch"
-                                     "tar-skip-unreliable-tests.patch"))))
+              "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"))
+            (patches (search-patches "tar-skip-unreliable-tests.patch"))))
    (build-system gnu-build-system)
+   ;; Note: test suite requires ~1GiB of disk space.
+   (arguments
+    '(#:phases (modify-phases %standard-phases
+                 (add-before 'build 'set-shell-file-name
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     ;; Do not use "/bin/sh" to run programs.
+                     (let ((bash (assoc-ref inputs "bash")))
+                       (substitute* "src/system.c"
+                         (("/bin/sh")
+                          (string-append bash "/bin/sh")))
+                       #t))))))
    (synopsis "Managing tar archives")
    (description
     "Tar provides the ability to create tar archives, as well as the