From patchwork Wed Jan 25 09:07:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 46399 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 70B7327BBEB; Wed, 25 Jan 2023 09:09:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 46B2327BBE9 for ; Wed, 25 Jan 2023 09:09:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKbmH-0003my-JD; Wed, 25 Jan 2023 04:09:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKbmB-0003iN-JT for guix-patches@gnu.org; Wed, 25 Jan 2023 04:09:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKbmA-00038j-6J for guix-patches@gnu.org; Wed, 25 Jan 2023 04:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pKbmA-0001eN-1C for guix-patches@gnu.org; Wed, 25 Jan 2023 04:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61052] [PATCH] download: Add url-fetch/xz-file. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Jan 2023 09:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61052@debbugs.gnu.org Cc: guix-devel@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16746377056290 (code B ref -1); Wed, 25 Jan 2023 09:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jan 2023 09:08:25 +0000 Received: from localhost ([127.0.0.1]:58261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKblY-0001dN-Os for submit@debbugs.gnu.org; Wed, 25 Jan 2023 04:08:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:60998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKblX-0001dG-6V for submit@debbugs.gnu.org; Wed, 25 Jan 2023 04:08:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKblR-0003WI-Fs; Wed, 25 Jan 2023 04:08:19 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKblO-00032p-3M; Wed, 25 Jan 2023 04:08:17 -0500 Date: Wed, 25 Jan 2023 17:07:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1674637686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=EJvNdeN4Vy+EQYuAf55Ty8L8DYWCL5GMEfN88ZYOHt4=; b=GRT4VzGl0fbVPTlIgLn5xlN6O5/Y3hGt76Hg+r6lbPuHmM0O87G8RXsfFUsVAgGI+dpRBT 4IHkb2IGTHX7FFKM0IAZwyHWtd6Vnkbc0Wej3Wp5zk//DbQ4WafzR9DTdHAQ9SaGgKM232 va3CwZ7sSomBubk17XuKO8gTRCVPX/6hXHHwWRiDe4wY9LCydxX3u7w8YVUovID4TBre4S 4EQ/G6iKH7V3qhmwBxnpb5NHn8gEqZykz4/MENCxQo8AHTAKsvq/BjDIMEKBxpkwSHRriZ zPXQ+hl45nE2noafgwe7KAJuxh39OQX1sAmP69iw9qk7/Z/328CA/RHV94v0ig== Message-ID: <87sffz2d9a.wl-hako@ultrarare.space> MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/download.scm (url-fetch/xz-file): New variable. --- guix/download.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) base-commit: 718223c58c20fa066527fb30da2b5dccca82913f diff --git a/guix/download.scm b/guix/download.scm index 2e9ecb43fc..cce62c4185 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -41,6 +41,7 @@ (define-module (guix download) (url-fetch* . url-fetch) url-fetch/executable url-fetch/tarbomb + url-fetch/xz-file url-fetch/zipbomb download-to-store)) @@ -602,6 +603,48 @@ (define tar #:graft? #f #:local-build? #t))) +(define* (url-fetch/xz-file url hash-algo hash + #:optional name + #:key (system (%current-system)) + (guile (default-guile))) + "Similar to 'url-fetch' but decompress the xz file at URL as the result. +This is mainly used for adding xz-compressed patches to a origin definition." + (define file-name + (match url + ((head _ ...) + (basename head)) + (_ + (basename url)))) + (define xz + (module-ref (resolve-interface '(gnu packages compression)) 'xz)) + + (mlet %store-monad ((drv (url-fetch* url hash-algo hash + (or name (basename file-name ".xz")) + #:system system + #:guile guile)) + (guile (package->derivation guile system))) + ;; Take the xz file, and simply decompress it. + ;; Use ungrafted xz so that the resulting file doesn't depend on whether + ;; grafts are enabled. + (gexp->derivation (or name file-name) + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "XZ_OPT" + (string-join (%xz-parallel-args))) + + (copy-file #$drv #$file-name) + (make-file-writable #$file-name) + (invoke (string-append #+xz "/bin/unxz") + #$file-name) + + (copy-file (basename #$file-name ".xz") + #$output))) + #:system system + #:guile-for-build guile + #:graft? #f + #:local-build? #t))) + (define* (url-fetch/zipbomb url hash-algo hash #:optional name #:key (system (%current-system))