[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88/136: guix: packages: Fix repacking of plain tarballs.
From: |
guix-commits |
Subject: |
88/136: guix: packages: Fix repacking of plain tarballs. |
Date: |
Sun, 17 Oct 2021 05:16:11 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit c96f072520491b0b8421e6ae200253c2457d31aa
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)))
- 97/136: gnu: Add python-flit-core., (continued)
- 97/136: gnu: Add python-flit-core., guix-commits, 2021/10/17
- 113/136: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 107/136: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/17
- 65/136: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/17
- 76/136: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/17
- 72/136: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/17
- 78/136: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/17
- 81/136: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/17
- 84/136: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/17
- 85/136: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/17
- 88/136: guix: packages: Fix repacking of plain tarballs.,
guix-commits <=
- 108/136: gnu: lsof: Fix indentation., guix-commits, 2021/10/17
- 103/136: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/17
- 117/136: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/17
- 106/136: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/17
- 102/136: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/17
- 128/136: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/17
- 119/136: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/17
- 124/136: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/17
- 68/136: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/17
- 75/136: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/17