[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88/180: guix: packages: Fix repacking of plain tarballs.
From: |
guix-commits |
Subject: |
88/180: guix: packages: Fix repacking of plain tarballs. |
Date: |
Fri, 29 Oct 2021 15:56:50 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 395479458abba0c802878111ae7f11e7418bdedd
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)))
- 166/180: gnu: python2-lit: Remove package., (continued)
- 166/180: gnu: python2-lit: Remove package., guix-commits, 2021/10/29
- 168/180: gnu: Add cling., guix-commits, 2021/10/29
- 170/180: gnu: gtkmm-3: Update to 3.24.5., guix-commits, 2021/10/29
- 110/180: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/29
- 116/180: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/29
- 123/180: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/29
- 122/180: gnu: heimdal: Fix build., guix-commits, 2021/10/29
- 140/180: gnu: gtk: Replace gdk-pixbuf+svg by librsvg., guix-commits, 2021/10/29
- 169/180: gnu: Add meson-0.59., guix-commits, 2021/10/29
- 78/180: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/29
- 88/180: guix: packages: Fix repacking of plain tarballs.,
guix-commits <=
- 91/180: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/29
- 95/180: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/29
- 96/180: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/29
- 98/180: gnu: Add python-tomli., guix-commits, 2021/10/29
- 99/180: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/29
- 101/180: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/29
- 102/180: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/29
- 103/180: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/29
- 107/180: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/29
- 106/180: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/29