From 9d5ac721b396c5642825deda48e2ef9da1d55597 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Sat, 19 Jan 2019 17:02:31 +0100 Subject: [PATCH 05/11] guix: ant-build-system: Use repack-archives * guix/build/ant-build-system.scm (strip-jar-timestamps): Use repack-archives instead of own implementation. --- guix/build/ant-build-system.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 540c985b7..7d639f492 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -190,15 +190,9 @@ dependencies of this jar file." #:allow-other-keys) "Unpack all jar archives, reset the timestamp of all contained files, and repack them. This is necessary to ensure that archives are reproducible." - (define (repack-archive jar) - (format #t "repacking ~a\n" jar) - (let* ((tmp (tmpnam))) - (copy-file jar tmp) - (invoke "repack" "-o" jar tmp))) - (for-each (match-lambda ((output . directory) - (for-each repack-archive (find-files directory "\\.jar$")))) + (repack-archives directory "\\.jar$"))) outputs) #t) -- 2.20.1