[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88/149: guix: packages: Fix repacking of plain tarballs.
From: |
guix-commits |
Subject: |
88/149: guix: packages: Fix repacking of plain tarballs. |
Date: |
Tue, 26 Oct 2021 23:52:27 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 575105707349d407f1165c43d222381918097f67
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)))
- 107/149: gnu: lsof: Disable the LTlock test., (continued)
- 107/149: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/26
- 109/149: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 111/149: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 121/149: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/26
- 117/149: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/26
- 122/149: gnu: heimdal: Fix build., guix-commits, 2021/10/26
- 120/149: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/26
- 129/149: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/26
- 135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/26
- 138/149: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/26
- 88/149: guix: packages: Fix repacking of plain tarballs.,
guix-commits <=
- 100/149: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/26
- 103/149: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/26
- 112/149: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 123/149: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/26
- 128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/26
- 136/149: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/26
- 137/149: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/26
- 132/149: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/26
- 139/149: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/26
- 141/149: gnu: librsvg: Preserve the loaders.cache file., guix-commits, 2021/10/26