apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 78f1fdbd168ab0b54a9c8bbb3c980c16cfae2709 Author: Maxim Cournoyer <[email protected]> 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 <[email protected]> --- 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)))
