[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
75/75: packages: Silence tar's support for --sort check output.
From: |
guix-commits |
Subject: |
75/75: packages: Silence tar's support for --sort check output. |
Date: |
Sun, 21 Jan 2024 13:21:54 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 87e62148c45c84c2514a60e610921f61fa5c0bfc
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 21 12:07:40 2024 -0500
packages: Silence tar's support for --sort check output.
* guix/packages.scm (patch-and-repack)
<tar-supports-sort?>: Invoke with 'invoke/quiet', catching any message
condition.
Change-Id: I1feee605f77bfe633d22901a3250e4c530fee6a6
---
guix/packages.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 64d1bc6158..15935ebfdd 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -961,14 +961,18 @@ specifies modules in scope when evaluating SNIPPET."
(ice-9 regex)
(srfi srfi-1)
(srfi srfi-26)
+ (srfi srfi-34)
+ (srfi srfi-35)
(guix build utils))
;; The --sort option was added to GNU tar in version 1.28, released
;; 2014-07-28. During bootstrap we must cope with older versions.
(define tar-supports-sort?
- (zero? (system* (string-append #+tar "/bin/tar")
+ (guard (c ((message-condition? c) #f))
+ (invoke/quiet (string-append #+tar "/bin/tar")
"cf" "/dev/null" "--files-from=/dev/null"
- "--sort=name")))
+ "--sort=name")
+ #t))
(define (apply-patch patch)
(format (current-error-port) "applying '~a'...~%" patch)
- 44/75: gnu: man-pages-posix: Remove redundant manpage compression., (continued)
- 44/75: gnu: man-pages-posix: Remove redundant manpage compression., guix-commits, 2024/01/21
- 46/75: build-system/go: Honor #:parallel-build?., guix-commits, 2024/01/21
- 48/75: import: crate: Emit new-style package inputs., guix-commits, 2024/01/21
- 54/75: gnu: bluez: Update to 5.72., guix-commits, 2024/01/21
- 57/75: packages: Fix repacked file name extension when zstd is unavailable., guix-commits, 2024/01/21
- 63/75: gnu: libgpg-error: Update to 1.47., guix-commits, 2024/01/21
- 64/75: gnu: libice: Update to 1.1.1., guix-commits, 2024/01/21
- 68/75: gnu: openjdk9: Make build reproducible., guix-commits, 2024/01/21
- 69/75: gnu: openjdk10: Make more reproducible., guix-commits, 2024/01/21
- 70/75: gnu: openjdk11: Make more reproducible., guix-commits, 2024/01/21
- 75/75: packages: Silence tar's support for --sort check output.,
guix-commits <=
- 39/75: gnu: xprop: Update to 1.2.6., guix-commits, 2024/01/21
- 49/75: import: go: Emit new-style package inputs., guix-commits, 2024/01/21
- 50/75: gnu: rust: Add profiling support., guix-commits, 2024/01/21
- 52/75: gnu: openjdk11: Update home page., guix-commits, 2024/01/21
- 55/75: gnu: font-fontna-yasashisa-antique: Remove input labels., guix-commits, 2024/01/21
- 59/75: gnu: python: Normalize sys.prefix in sitecustomize.py., guix-commits, 2024/01/21
- 72/75: gnu: openjdk13: Make reproducible., guix-commits, 2024/01/21
- 19/75: gnu: font-linuxlibertine: Install all license files., guix-commits, 2024/01/21
- 26/75: gnu: font-go: Install license files., guix-commits, 2024/01/21
- 27/75: gnu: font-dosis: Remove extraneous files; install license file., guix-commits, 2024/01/21