[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88/217: guix: packages: Fix repacking of plain tarballs.
From: |
guix-commits |
Subject: |
88/217: guix: packages: Fix repacking of plain tarballs. |
Date: |
Sun, 14 Nov 2021 19:20:49 -0500 (EST) |
vagrantc pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit b980766bd7e4fd7fe75e222f3dfc91d1eceb69f1
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 fb7eabd..083ee6d 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -981,10 +981,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)))
- 41/217: gnu: gst-plugins-base: Update to 1.19.2., (continued)
- 41/217: gnu: gst-plugins-base: Update to 1.19.2., guix-commits, 2021/11/14
- 82/217: gnu: curl: Honor #:tests?., guix-commits, 2021/11/14
- 164/217: gnu: gdb: Update to 11.1 and remove gdb-9.2., guix-commits, 2021/11/14
- 162/217: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/11/14
- 160/217: gnu: mesa: Replace obsolete vulkan-overlay-layer build option., guix-commits, 2021/11/14
- 166/217: gnu: python2-lit: Remove package., guix-commits, 2021/11/14
- 172/217: gnu: dconf: Update to 0.40.0., guix-commits, 2021/11/14
- 179/217: gnu: Add polkit-duktape., guix-commits, 2021/11/14
- 190/217: gnu: python-requests: Update to 2.26.0., guix-commits, 2021/11/14
- 89/217: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/11/14
- 88/217: guix: packages: Fix repacking of plain tarballs.,
guix-commits <=
- 87/217: gnu: gdb: Normalize indentation., guix-commits, 2021/11/14
- 100/217: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/11/14
- 106/217: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/11/14
- 112/217: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/11/14
- 120/217: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/11/14
- 138/217: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/11/14
- 143/217: gnu: elogind: Update to 246.10., guix-commits, 2021/11/14
- 152/217: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/11/14
- 167/217: gnu: python-lit: Update to 12.0.1., guix-commits, 2021/11/14
- 169/217: gnu: Add meson-0.59., guix-commits, 2021/11/14