[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
89/115: guix: packages: Fix repacking of plain tarballs.
From: |
guix-commits |
Subject: |
89/115: guix: packages: Fix repacking of plain tarballs. |
Date: |
Fri, 15 Oct 2021 09:49:15 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 92bdce9282f93daa1b429737c72992df6790717e
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)))
- 101/115: gnu: python-pytest-6: Fix version via setuptools-scm., (continued)
- 101/115: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/15
- 105/115: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/15
- 107/115: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/15
- 109/115: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/15
- 110/115: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/15
- 115/115: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/15
- 66/115: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/15
- 68/115: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/15
- 76/115: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/15
- 82/115: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/15
- 89/115: guix: packages: Fix repacking of plain tarballs.,
guix-commits <=
- 90/115: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/15
- 91/115: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/15
- 93/115: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/15
- 97/115: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/15
- 104/115: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/15
- 62/115: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/15
- 94/115: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/15
- 95/115: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/15
- 96/115: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/15
- 98/115: gnu: Add python-flit-core., guix-commits, 2021/10/15