[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88/169: guix: packages: Fix repacking of plain tarballs.
From: |
guix-commits |
Subject: |
88/169: guix: packages: Fix repacking of plain tarballs. |
Date: |
Thu, 28 Oct 2021 02:08:37 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 78f1fdbd168ab0b54a9c8bbb3c980c16cfae2709
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)))
- 45/169: gnu: gst-plugins-ugly: Update to 1.19.2., (continued)
- 45/169: gnu: gst-plugins-ugly: Update to 1.19.2., guix-commits, 2021/10/28
- 41/169: gnu: gst-plugins-base: Update to 1.19.2., guix-commits, 2021/10/28
- 43/169: gnu: zxing-cpp: Update to 1.2.0., guix-commits, 2021/10/28
- 48/169: gnu: python-gst: Update to 1.19.2., guix-commits, 2021/10/28
- 64/169: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/10/28
- 63/169: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/28
- 67/169: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/10/28
- 68/169: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/28
- 86/169: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/28
- 90/169: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/28
- 88/169: guix: packages: Fix repacking of plain tarballs.,
guix-commits <=
- 95/169: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/28
- 100/169: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/28
- 104/169: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/28
- 106/169: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/28
- 93/169: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/28
- 101/169: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/28
- 109/169: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/28
- 118/169: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/28
- 120/169: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/28
- 133/169: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/10/28