[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88/130: guix: packages: Fix repacking of plain tarballs.
From: |
guix-commits |
Subject: |
88/130: guix: packages: Fix repacking of plain tarballs. |
Date: |
Sat, 16 Oct 2021 02:36:37 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit b63a416926420cef87627df642108adc5b48d12f
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Aug 30 17:32:21 2021 -0400
guix: packages: Fix repacking of plain tarballs.
Fixes <https://issues.guix.gnu.org/50066>.
* guix/packages.scm (patch-and-repack): Test for a tarball using tarball?
and
move the plain file copy to the else clause.
Reported-by: Mathieu Othacehe <othacehe@gnu.org>
---
guix/packages.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index fa23cc3..509dc49 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -934,10 +934,10 @@ specifies modules in scope when evaluating SNIPPET."
((file-is-directory? #+source)
(copy-recursively directory #$output
#:log (%make-void-port "w")))
- ((not #+comp)
- (copy-file file #$output))
- (else
- (repack directory #$output)))))))
+ ((or #+comp (tarball? #+source))
+ (repack directory #$output))
+ (else ;single uncompressed file
+ (copy-file file #$output)))))))
(let ((name (if (or (checkout? original-file-name)
(not (compressor original-file-name)))
- 61/130: gnu: gst-plugins-base: Update to 1.18.5., (continued)
- 61/130: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/16
- 64/130: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/10/16
- 68/130: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/16
- 69/130: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/16
- 67/130: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/10/16
- 79/130: gnu: diffutils: Fix signal processing., guix-commits, 2021/10/16
- 73/130: bluez: Update to 5.61., guix-commits, 2021/10/16
- 80/130: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/16
- 85/130: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/16
- 93/130: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/16
- 88/130: guix: packages: Fix repacking of plain tarballs.,
guix-commits <=
- 91/130: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/16
- 95/130: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/16
- 94/130: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/16
- 98/130: gnu: Add python-tomli., guix-commits, 2021/10/16
- 105/130: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/16
- 107/130: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/16
- 106/130: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/16
- 108/130: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/16
- 113/130: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/16
- 115/130: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/16