From patchwork Thu Jan 4 16:48:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58355 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 4935627BBE2; Thu, 4 Jan 2024 16:51:38 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 321F027BBE9 for ; Thu, 4 Jan 2024 16:51:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLQvy-0003WR-W3; Thu, 04 Jan 2024 11:51:07 -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 1rLQvx-0003Ud-7X for guix-patches@gnu.org; Thu, 04 Jan 2024 11:51:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLQvv-0001Ts-Og; Thu, 04 Jan 2024 11:51:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLQvv-0005We-BQ; Thu, 04 Jan 2024 11:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH 3/5] packages: Repack patched source archives via zstd by default. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Thu, 04 Jan 2024 16:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68242 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68242@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.170438700621131 (code B ref 68242); Thu, 04 Jan 2024 16:51:03 +0000 Received: (at 68242) by debbugs.gnu.org; 4 Jan 2024 16:50:06 +0000 Received: from localhost ([127.0.0.1]:55551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQuz-0005Uj-8n for submit@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:06 -0500 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:58741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQuw-0005Td-K2 for 68242@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:03 -0500 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-68015293aa3so2952766d6.1 for <68242@debbugs.gnu.org>; Thu, 04 Jan 2024 08:49:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704386993; x=1704991793; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gorrJbbDJd4H+7mdRg3rdxzNxojXiDwitWD4uR6K/yg=; b=K0qA1C1TgrTXFz2QMepKbKxJq1a+6NUkgchQkdZYmf3LazNcIQ+5mthUWOWYTHNmXb CJAECELtFcUis0Te/K7sLkWapuy4n8+5yEkFz6eWK6xkvHqXzIv7MDmw03UpGPBabh7m D1XQUSDLk2Wo262ZD2uRxYQ9TQxeDFV9SEFyK4ClkPsRanNXPZeGI8kqTU2/Wn9RsaZk fS09KAb2f2urujaXW3ZiFbFSdUFAcESOUOMBNx/JKurQaVyVdEcx/B671L+AKWSI81Ho nnmo3aeKNP6LpkiXgNKuqrwKcapySuUx/C5ScCDTd5lTM6+VOPEQrCX3irJfJxjyAb26 eP1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704386993; x=1704991793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gorrJbbDJd4H+7mdRg3rdxzNxojXiDwitWD4uR6K/yg=; b=XZTXcxlkpK3DmD3oiqyE+wGM8tVGduQkhzOmFbi56ozcKcxUYbWRt0PvvdmrS73xnB xKodE5ljKRN2x+tcTglEszr+NZwkw25drBFQEnz6SDNdveMMBdNKsuwAQjtjq18sQGC2 lQhd3Ppprq46mCRTKtG6uEcnvNJY28A88YkjAZlzWD9VezpJZWDyr/t7wVTcIGtplvLM ZCqUvMzZo20kXSB2wkmvXthKH6K2WqNlrVkzHVbPTa+uWI8KHkHco9igXZVI0Rs27lu0 EUCukK4G0jFfsV1qwbXa+Q1AUltFSpRnSmIkGeqmHrj4bXK2G1RFBqjotL0gHJnIVByM ijWg== X-Gm-Message-State: AOJu0YypL2gjMiBUk53IJHrOhIJ2Pws37PZ/MGZ4Ldmg75Ljan8Daj7f +WRFoB0DzmHdt+c80tCI3nGzNJDN2krlyA== X-Google-Smtp-Source: AGHT+IE5DZQAgR7cstUkGiYq/ujo4trk7xlgJDkhouHvSR+tP7ZkiD8Epn6FJ0sKVPAiEbo71uuweQ== X-Received: by 2002:a05:6214:5007:b0:67a:a721:ec03 with SMTP id jo7-20020a056214500700b0067aa721ec03mr1013737qvb.71.1704386992752; Thu, 04 Jan 2024 08:49:52 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id o2-20020a0cecc2000000b0067aab230ed9sm11854706qvq.21.2024.01.04.08.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 08:49:52 -0800 (PST) From: Maxim Cournoyer Date: Thu, 4 Jan 2024 11:48:19 -0500 Message-ID: <731e80fc6d38e18709f359ea2f982e9b302b2864.1704386901.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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/build/utils.scm (compressor): Register zst file name extension. * guix/packages.scm (%standard-patch-inputs): Add zstd. (patch-and-repack): Rename tarxz-name nested procedure to tar-file-name, and accept a new 'ext' argument; adjust accordingly. Add zstd binding, and replace the XZ_DEFAULTS environment variable with ZSTD_NBTHREADS. Fallback to xz when zstd is not available. Change-Id: I614a6be8c87a4a0858eadce616c51d8e9b9fc020 --- guix/build/utils.scm | 1 + guix/packages.scm | 50 +++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index e87066cc02..9c1e19f6d8 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -177,6 +177,7 @@ (define (compressor file-name) ((string-suffix? "lz" file-name) "lzip") ((string-suffix? "zip" file-name) "unzip") ((string-suffix? "xz" file-name) "xz") + ((string-suffix? "zst" file-name) "zstd") (else #f))) ;no compression used/unknown file extension (define (tarball? file-name) diff --git a/guix/packages.scm b/guix/packages.scm index cb8db925f8..ce1ba7c53a 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2017, 2019, 2020, 2022 Efraim Flashner ;;; Copyright © 2019 Marius Bakke -;;; Copyright © 2020, 2021 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2024 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022 jgart @@ -862,6 +862,7 @@ (define (%standard-patch-inputs system) (module-ref (resolve-interface module) var)))))) `(("tar" ,(ref '(gnu packages base) 'tar)) ("xz" ,(ref '(gnu packages compression) 'xz)) + ("zstd" ,(ref '(gnu packages compression) 'zstd)) ("bzip2" ,(ref '(gnu packages compression) 'bzip2)) ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) @@ -926,31 +927,35 @@ (define* (patch-and-repack source patches ;; Return true if DIRECTORY is a checkout (git, svn, etc). (string-suffix? "-checkout" directory)) - (define (tarxz-name file-name) - ;; Return a '.tar.xz' file name based on FILE-NAME. + (define (tar-file-name file-name ext) + ;; Return a '$filename.tar.$ext' file name based on FILE-NAME and EXT. (let ((base (if (numeric-extension? file-name) original-file-name (file-sans-extension file-name)))) (string-append base (if (equal? (file-extension base) "tar") - ".xz" - ".tar.xz")))) + (string-append "." ext) + (string-append ".tar." ext))))) (define instantiate-patch (match-lambda - ((? string? patch) ;deprecated + ((? string? patch) ;deprecated (local-file patch #:recursive? #t)) - ((? struct? patch) ;origin, local-file, etc. + ((? struct? patch) ;origin, local-file, etc. patch))) - (let ((tar (lookup-input "tar")) - (gzip (lookup-input "gzip")) - (bzip2 (lookup-input "bzip2")) - (lzip (lookup-input "lzip")) - (xz (lookup-input "xz")) - (patch (lookup-input "patch")) - (comp (and=> (compressor source-file-name) lookup-input)) - (patches (map instantiate-patch patches))) + (let* ((tar (lookup-input "tar")) + (gzip (lookup-input "gzip")) + (bzip2 (lookup-input "bzip2")) + (lzip (lookup-input "lzip")) + (xz (lookup-input "xz")) + (zstd (or (lookup-input "zstd") + ;; Fallback to xz in case zstd is not available, such as + ;; for bootstrap packages. + xz)) + (patch (lookup-input "patch")) + (comp (and=> (compressor source-file-name) lookup-input)) + (patches (map instantiate-patch patches))) (define build (with-imported-modules '((guix build utils)) #~(begin @@ -1028,12 +1033,12 @@ (define* (patch-and-repack source patches locale (system-error-errno args))))) (setenv "PATH" - (string-append #+xz "/bin" + (string-append #+zstd "/bin" (if #+comp (string-append ":" #+comp "/bin") ""))) - (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) + (setenv "ZSTD_NBTHREADS" (number->string (parallel-job-count))) ;; SOURCE may be either a directory, a tarball or a simple file. (let ((name (strip-store-file-name #+source)) @@ -1088,10 +1093,13 @@ (define* (patch-and-repack source patches (else ;single uncompressed file (copy-file file #$output))))))) - (let ((name (if (or (checkout? original-file-name) - (not (compressor original-file-name))) - original-file-name - (tarxz-name original-file-name)))) + (let* ((ext (if zstd + "zst" ;usual case + "xz")) ;zstd-less bootstrap-origin + (name (if (or (checkout? original-file-name) + (not (compressor original-file-name))) + original-file-name + (tar-file-name original-file-name ext)))) (gexp->derivation name build #:graft? #f #:system system