From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH 0/5] Compress man pages using zstd 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 15:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org 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 submit@debbugs.gnu.org id=B.170438142915384 (code B ref -1); Thu, 04 Jan 2024 15:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jan 2024 15:17:09 +0000 Received: from localhost ([127.0.0.1]:55462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLPT3-000404-As for submit@debbugs.gnu.org; Thu, 04 Jan 2024 10:17:09 -0500 Received: from lists.gnu.org ([2001:470:142::17]:48138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLPSz-0003zT-OH for submit@debbugs.gnu.org; Thu, 04 Jan 2024 10:17: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 1rLPSq-0003Ik-DN for guix-patches@gnu.org; Thu, 04 Jan 2024 10:16:56 -0500 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLPSo-0003A6-26 for guix-patches@gnu.org; Thu, 04 Jan 2024 10:16:56 -0500 Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-42836658198so2854691cf.0 for ; Thu, 04 Jan 2024 07:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704381413; x=1704986213; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RQQSuWf5Qc4RndWb5qHMme5GD0PZpRl9BOJnLrqWKIQ=; b=HY0ePVBNstAcgcUTsKI3UtW7AEzaJsUVpQUmBAsxLS9QrrrQokmjd2QpXpSR+Hm58R INIDtBWyh5E4FjsqgcM8JTnWn6QclXimJ/gnc6rv0BuOW03mNolz234v9toHRwmERGkA U5VB1agMr1AH2edl6CkeUi70FwrOCifkE1bgP3O4jgT2MIxELBfeKqbewQaaOo7OdS0h fhS6EkucuqReGFIWURfkfRMzichWwKg29TFzgIwL0hV5LJDvpqp1V8iuakNTICqQF7hp jhPdKxwa3ZnXOeh/JtCfU3HXyrSECXbMt8WV8p13O5jWzTXUHFv8iWehOc+lF69b+trD yeBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381413; x=1704986213; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RQQSuWf5Qc4RndWb5qHMme5GD0PZpRl9BOJnLrqWKIQ=; b=FywsRD8x8an0+hXoOkTKpTEUxuf0s2B6jcgvZOKp3UNeWGp87f8nCAB1RSHJ+nrajE zyGYugkUteXlEUr5bWJ89CxkV0dQkqDWgVCfwVgm3C+MYP0yWzLexQB0NpxKEfGazP/Q q66G6k1sbUbygcF3EVWz9FlM4go8NVHtZqbNDjkjSBL1zgXhHOBj+BI2PnkRKIMuPGgF TizfgJMVeyWCj3NpathVh9VU+2f5tzwyk9qup0uZMPqjUPkUX2lQpP8KYx5JCEp6n+3G SKPc1hHGU7LJRMKJgOmc6ceRnNetNxIQbxw4j7P9ZmWHA9SMdWtXrlnMz9KddrBtvQCE M7Ng== X-Gm-Message-State: AOJu0Yxmu1doW6MeeA+xGHxvCJu6VWj+kUHCiYO+54aplVdP75ImbH3y g/XVIBqqY+qnOw+b6OpMKWJetWUF5ac+fg== X-Google-Smtp-Source: AGHT+IEEfa5WoAoUvtWVombvNtrGs4JwDE1G4MfZaUl2kCUSdNt3VNqW6UBnOD0MwfB6/R/kYAGaXA== X-Received: by 2002:a05:622a:34b:b0:428:3c5f:8e9c with SMTP id r11-20020a05622a034b00b004283c5f8e9cmr749497qtw.37.1704381412695; Thu, 04 Jan 2024 07:16:52 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id x7-20020ac84a07000000b00423e9316931sm15280968qtq.83.2024.01.04.07.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:16:52 -0800 (PST) From: Maxim Cournoyer Date: Thu, 4 Jan 2024 10:16:41 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::82e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82e.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This series changes the compressor of our man pages from gzip to zstd, which decompresses much faster, and compresses better at the chosen level (19). Maxim Cournoyer (5): utils: Lower xz compression memory usage limit to 20%. compression: Enable zstd parallel compression. packages: Repack patched source archives via zstd by default. build: gnu-build-system: Compress man pages with zstd. man-db: Add support for zstd compressed man pages. gnu/compression.scm | 3 +- gnu/packages/commencement.scm | 3 +- guix/build/gnu-build-system.scm | 71 +++++++++++++++++++++------------ guix/build/utils.scm | 3 +- guix/man-db.scm | 45 ++++++++++++++++----- guix/packages.scm | 51 +++++++++++++---------- guix/profiles.scm | 8 +++- 7 files changed, 122 insertions(+), 62 deletions(-) base-commit: 784a7e8da6456e6388e2bfc213e93e252eb2be40 -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH 1/5] utils: Lower xz compression memory usage limit to 20%. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Jan 2024 16:51:02 +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 Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.170438700321102 (code B ref 68242); Thu, 04 Jan 2024 16:51:02 +0000 Received: (at 68242) by debbugs.gnu.org; 4 Jan 2024 16:50:03 +0000 Received: from localhost ([127.0.0.1]:55545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQuw-0005UH-5H for submit@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:02 -0500 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:60781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQut-0005TY-Al for 68242@debbugs.gnu.org; Thu, 04 Jan 2024 11:49:59 -0500 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-680adbf077dso3358986d6.1 for <68242@debbugs.gnu.org>; Thu, 04 Jan 2024 08:49:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704386989; x=1704991789; 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=c1I23V7l8eXQA+lX6MILN8YlIog5MupwuEFf7p6YhT4=; b=P+UPLhfangMXj0yLTsQfdK0Byb2JOJNdtfxvRIeXHi/GevTdrY6kHMc6phvNoW+8nf kdQDo3CtFtRkBLtl0chvwZt0TfTCP8mUrNGZYBu7AXrJBB1VguJQop8aHe/1qa7dXDX7 hwUaOW14FEKSX0cx/4RhJMcZBh1bFxzswKBid0psDYXAhqay4sGGzmpIlsPbLgFElhVk ITfIJD2dPCgj4CSWmN1Lu3UOSiw8Gh5ZYmZHLjgUo4TxUKRH6p4b3mT2xO3I14HuvSXj /5Fjy5dLLJPazGTtUpdWvPn+42LMkXg+WWmF8X9Nl2TArYuNbOkkw/ab+S/5mpmObXXO GAkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704386989; x=1704991789; 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=c1I23V7l8eXQA+lX6MILN8YlIog5MupwuEFf7p6YhT4=; b=lLastnO9reKbsLW3RvON/VDURzo7RpFf3Yninn9xDvI88avazFdwVF0IVeSC1xucwv JcaliWj5+2dbSJV9fCHB9Tu5Kwkb8HYWszkT4aaUrJz363bkSWT0qhlT+yx9Bmivjcep Pvl9SefQGHO8064c9E0DFuZYRzI517oBpEVaFZb8VaKg4Rd8Elv2ZMMVeG4X7vGVNFWE XwpG+UKL7kcNYiToaDEFaiyHTazYdE0iHjge8dt/9JQZv/xDshJoguZ4YxSHqGMeNEAq L/qoozxWTSK3QB+rd2qDxi7Bv5TCUdS85XpkRzmbq2X2JAHmkxxfOsI2Acu6mt0bD1Ji xYtQ== X-Gm-Message-State: AOJu0YyIvz4l7Zg/6N5549sT42fKciGmoS4vIlG9ygg3oBQ9X/kt/GZ4 qAhlrXROAwCMSdr9yFYTpf13GhSdvlwWOg== X-Google-Smtp-Source: AGHT+IHE18ldLUKI8RGU2h7MM7kB4Z4ZUons7U3qu1qVw8PJm/ubCWuPgCNayftPinWHctXy+RfAGQ== X-Received: by 2002:a05:6214:20ec:b0:67f:1c79:88e1 with SMTP id 12-20020a05621420ec00b0067f1c7988e1mr936542qvk.40.1704386989278; Thu, 04 Jan 2024 08:49:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 08:49:48 -0800 (PST) From: Maxim Cournoyer Date: Thu, 4 Jan 2024 11:48:17 -0500 Message-ID: <148980a1febb6921bd1b02da6c6d5b9defecd50a.1704386901.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) There were sometimes out of memory errors on the Berlin build farm, especially for i686 or arm machines having less memory. * guix/build/utils.scm (%xz-parallel-args): Reduce --memlimit value from 50% to 20%. Change-Id: If848bed92ef4c42d11a96057e59ee51a019d0573 --- guix/build/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 8e630ad586..e87066cc02 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -186,7 +186,7 @@ (define (tarball? file-name) (define (%xz-parallel-args) "The xz arguments required to enable bit-reproducible, multi-threaded compression." - (list "--memlimit=50%" + (list "--memlimit=20%" (format #f "--threads=~a" (max 2 (parallel-job-count))))) -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH 2/5] compression: Enable zstd parallel compression. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Jan 2024 16:51:02 +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 Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.170438700521123 (code B ref 68242); Thu, 04 Jan 2024 16:51:02 +0000 Received: (at 68242) by debbugs.gnu.org; 4 Jan 2024 16:50:05 +0000 Received: from localhost ([127.0.0.1]:55549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQuy-0005UY-O7 for submit@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:05 -0500 Received: from mail-qk1-x730.google.com ([2607:f8b0:4864:20::730]:58794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQuu-0005Tb-RG for 68242@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:01 -0500 Received: by mail-qk1-x730.google.com with SMTP id af79cd13be357-78160ce40ceso44959685a.1 for <68242@debbugs.gnu.org>; Thu, 04 Jan 2024 08:49:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704386991; x=1704991791; 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=MRpF8Igy6aH+4rajax5A1C1kV57pcy2RBWf3lBfFgqw=; b=XJYwg6svc7BD0udnYUYM1aSXnqNQkCKbw6/CLU3gPLRDr/9MlzCg59V3b6W3bbcB43 K+O9hfbPLCRPfL0efsP3gTKwq+Xt8qocF1/tGo8Qr5r03hWMzcotrVCt8XcDKlUaV1qR y9OVkQ6FwPAsUNVr/C6qzZHh6LkJ0P1QUxVJnDPcGwGN6+pYx+6VyWa/mIE76eiv7ADP AMqcfRm+Beoa9l+kTActcgHfFN3xleDxdQYh9yTLxFp8kK3lV69qAvOo0tZGcTt/LMLY ebsnlfnYYXwFGQBXRkybOz0rkj4QsSYbcBEoYy0Fmbrn7b7zra7F22UYSUm78/9xRKl3 6aZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704386991; x=1704991791; 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=MRpF8Igy6aH+4rajax5A1C1kV57pcy2RBWf3lBfFgqw=; b=PSHOvTMHL7ZyOj9tjyOdgBaS46lEboYcbduBP/oRYSUgkDGABsB7t10764nos/nCMP yLKVjzZRt5HSfYQMPoQiKqbznhvoeMDk8xq0+1JjBP/bHYZTqdwo5TAs+wv3y17t5UL7 7ScGgeu+UUJpt1OUuVj8p08TN+J13YlZHhAU/hYyZ4uZAfbx8g3XMDTYrZSXfI0ZH3Kt P9NmvXVJ1Vx1z/X2uYkyxiWF5ghWSECzUbhJoiJUnO3wIU3ZvKI6nBgzSAYxrRciPvQ3 gBExHtB5f0/Fx7etvIlfheLOQ+pMpo+EfHjmBhT+6Aa+623TeZXfBEtwQh3hvamFz9bU EcWQ== X-Gm-Message-State: AOJu0Yy1UfcYJPegH4sec71iv9JMT541lAqX+QxVVPYtqCleFv+TyE1x EPjIYMrg1gXvWElOgxf9Rdz/r090QpNVvQ== X-Google-Smtp-Source: AGHT+IEd2AIW5I8ToY7p9uTIO5jwc/UdYE1TQEe5/UvPlf4te6PVl69zW6DFv0DvnKtn3hxLjka9cg== X-Received: by 2002:a05:6214:d4d:b0:67f:7781:1f88 with SMTP id 13-20020a0562140d4d00b0067f77811f88mr923181qvr.1.1704386990927; Thu, 04 Jan 2024 08:49:50 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 08:49:50 -0800 (PST) From: Maxim Cournoyer Date: Thu, 4 Jan 2024 11:48:18 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/compression.scm (%compressors) [zstd]: Provide the --threads argument. Change-Id: I4e8dfe725d1b0721c0016c3013b9e609fee94367 --- gnu/compression.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/compression.scm b/gnu/compression.scm index 0418e80a15..6e48de5979 100644 --- a/gnu/compression.scm +++ b/gnu/compression.scm @@ -56,7 +56,8 @@ (define %compressors ;; The default level 3 compresses better than gzip in a ;; fraction of the time, while the highest level 19 ;; (de)compresses more slowly and worse than xz. - #~(list #+(file-append zstd "/bin/zstd") "-3")) + #~(list #+(file-append zstd "/bin/zstd") "-3" + (format #f "--threads=~a" (parallel-job-count)))) (compressor "none" "" #f))) (define (lookup-compressor name) -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH 4/5] build: gnu-build-system: Compress man pages with zstd. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: 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 Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.170438700921148 (code B ref 68242); Thu, 04 Jan 2024 16:51:03 +0000 Received: (at 68242) by debbugs.gnu.org; 4 Jan 2024 16:50:09 +0000 Received: from localhost ([127.0.0.1]:55554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQv2-0005Uz-5t for submit@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:08 -0500 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:43158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQuy-0005Tg-A6 for 68242@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:04 -0500 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-67f85fe5632so12649646d6.0 for <68242@debbugs.gnu.org>; Thu, 04 Jan 2024 08:50:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704386994; x=1704991794; 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=asy7LyZfXPjVW081p0UTEaaCiZmbqSgwvwsjh3Rbp80=; b=Y+sBp/TerG3fCMxebOXIVdPWlIV8fDu43ohG+3h2qbfkOsn8Uk3iFZSbwkEpQqQLAA QT2P7qHfFDwf014+dmbqh+iI6G2upU1co/sZ+wDwvmf0zTYJQY4sYhwkZatGuq5QtvpD eMVy8tPf4FGZD1sGvE24LR6X8fww6R1jQJijm7+11/Iv/e8wAjyFPbufK9VXQPyoVV6a H3zNVX4pcgJtnWA8nY2iIPBxKu8dyeFliP+J8qw3KlXOetBa42WCdPMCgjjCX5sEffwy zQGxkRnKU94ORBvar+S3rEc4fGopNKHvo6XXbFS6TGx+wcc+53SYpItGYk3wHpETyald Ol3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704386994; x=1704991794; 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=asy7LyZfXPjVW081p0UTEaaCiZmbqSgwvwsjh3Rbp80=; b=wf/atM5QwDKT2Xk3oRuIvGWpqFzWuFakEaluyy6jdeRhjr0f64CarCAi+jOeuWMSAb 0WBiIWhCfRqG/ian+dn7ybk1zmeQIIdJIOHAdnnmlwIJTbEy40UK0GlRvqvWBJOsdVH6 4QN4NThVMt/Q79rL3x3cFmqWEH3KSUidPwB/3jCbNCc3ehO32GmMfFBgJoBd/vrV0pK/ SaufJydf2SxzYSn3ni/qDic2kZL60VvJhdK4vlzw5uYao6MmHt0USGgPcxT2ZdbbhNCF OCUwfLnpITk1mVU8TCUPZQji5KNji342G7sP+DPFEx39Fv5G5JtDeqTusJsnsQf3qSnr 0kkw== X-Gm-Message-State: AOJu0YxlkiJgULZLp/e+LjxEtDUulbZQM7KWFQ+NnaduF6kSGRC0CvvC MwUYwjUJ5p1+96OWfnXPTbnBHkcCIEeswg== X-Google-Smtp-Source: AGHT+IF+HUbPTlS0d5rHRrCinyQwTwCatMn5AhGtH8zDkpJ/Rn27+EOIfh5Yjxm7oI1po0jExd+Rqw== X-Received: by 2002:a05:6214:21a2:b0:67f:67ca:1181 with SMTP id t2-20020a05621421a200b0067f67ca1181mr1008571qvc.40.1704386994578; Thu, 04 Jan 2024 08:49:54 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 08:49:54 -0800 (PST) From: Maxim Cournoyer Date: Thu, 4 Jan 2024 11:48:20 -0500 Message-ID: <6425d5767b4ca53ed6de612c0f77e3d6a872af51.1704386901.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The aim is to improve the efficiency of computing the man pages database, which must decompress the man pages. Zstd is faster than gzip, especially for decompression, and has a similar compression ratio. * gnu/packages/commencement.scm (%final-inputs): Add zstd. * guix/build/gnu-build-system.scm (compress-documentation) Update doc. : New arguments. : Rename argument to... : ... this. Add an 'extension' argument to the retarget-symlink nested procedure. Use new arguments in nested 'maybe-compress' procedure. Change-Id: Ibaad4658f8e5151633714d263d9198f56d255020 --- gnu/packages/commencement.scm | 3 +- guix/build/gnu-build-system.scm | 73 +++++++++++++++++++++------------ 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ae1c91f0d0..51c26339ef 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3492,7 +3492,8 @@ (define-public %final-inputs (native-inputs (list (if (target-hurd?) glibc-utf8-locales-final/hurd - glibc-utf8-locales-final))))))) + glibc-utf8-locales-final))))) + ("zstd" ,zstd))) ("sed" ,sed-final) ("grep" ,grep-final) ("xz" ,xz-final) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 51b8f9acbf..ff9b123ae6 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2020 Brendan Tildesley -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -644,21 +644,36 @@ (define* (reset-gzip-timestamps #:key outputs #:allow-other-keys) (((names . directories) ...) (for-each process-directory directories)))) -(define* (compress-documentation #:key outputs +(define* (compress-documentation #:key + outputs (compress-documentation? #t) - (documentation-compressor "gzip") - (documentation-compressor-flags + (info-compressor "gzip") + (info-compressor-flags '("--best" "--no-name")) - (compressed-documentation-extension ".gz") + (info-compressor-file-extension ".gz") + (man-compressor (if (which "zstd") + "zstd" + info-compressor)) + (man-compressor-flags + (if (which "zstd") + (list "-19" "--rm" + "--threads" (string->number + (parallel-job-count))) + info-compressor-flags)) + (man-compressor-file-extension + (if (which "zstd") + ".zst" + info-compressor-file-extension)) #:allow-other-keys) - "When COMPRESS-DOCUMENTATION? is true, compress man pages and Info files -found in OUTPUTS using DOCUMENTATION-COMPRESSOR, called with -DOCUMENTATION-COMPRESSOR-FLAGS." - (define (retarget-symlink link) + "When COMPRESS-INFO-MANUALS? is true, compress Info files found in OUTPUTS +using INFO-COMPRESSOR, called with INFO-COMPRESSOR-FLAGS. Similarly, when +COMPRESS-MAN-PAGES? is true, compress man pages files found in OUTPUTS using +MAN-COMPRESSOR, using MAN-COMPRESSOR-FLAGS." + (define (retarget-symlink link extension) (let ((target (readlink link))) (delete-file link) - (symlink (string-append target compressed-documentation-extension) - (string-append link compressed-documentation-extension)))) + (symlink (string-append target extension) + (string-append link extension)))) (define (has-links? file) ;; Return #t if FILE has hard links. @@ -676,23 +691,23 @@ (define* (compress-documentation #:key outputs (symbolic-link? target-absolute)) (lambda args (if (= ENOENT (system-error-errno args)) - (begin - (format (current-error-port) - "The symbolic link '~a' target is missing: '~a'\n" - symlink target-absolute) - #f) + (format (current-error-port) + "The symbolic link '~a' target is missing: '~a'\n" + symlink target-absolute) (apply throw args)))))) - (define (maybe-compress-directory directory regexp) + (define (maybe-compress-directory directory regexp + compressor + compressor-flags + compressor-extension) (when (directory-exists? directory) (match (find-files directory regexp) - (() ;nothing to compress + (() ;nothing to compress #t) - ((files ...) ;one or more files + ((files ...) ;one or more files (format #t "compressing documentation in '~a' with ~s and flags ~s~%" - directory documentation-compressor - documentation-compressor-flags) + directory compressor compressor-flags) (call-with-values (lambda () (partition symbolic-link? files)) @@ -702,20 +717,26 @@ (define* (compress-documentation #:key outputs ;; unchanged ('gzip' would refuse to compress them anyway.) ;; Also, do not retarget symbolic links pointing to other ;; symbolic links, since these are not compressed. - (for-each retarget-symlink + (for-each (cut retarget-symlink <> compressor-extension) (filter (lambda (symlink) (and (not (points-to-symlink? symlink)) (string-match regexp symlink))) symlinks)) - (apply invoke documentation-compressor - (append documentation-compressor-flags + (apply invoke compressor + (append compressor-flags (remove has-links? regular-files))))))))) (define (maybe-compress output) (maybe-compress-directory (string-append output "/share/man") - "\\.[0-9]+$") + "\\.[0-9]+$" + man-compressor + man-compressor-flags + man-compressor-file-extension) (maybe-compress-directory (string-append output "/share/info") - "\\.info(-[0-9]+)?$")) + "\\.info(-[0-9]+)?$" + info-compressor + info-compressor-flags + info-compressor-file-extension)) (if compress-documentation? (match outputs -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH 5/5] man-db: Add support for zstd compressed man pages. 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:04 +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.170438700921154 (code B ref 68242); Thu, 04 Jan 2024 16:51:04 +0000 Received: (at 68242) by debbugs.gnu.org; 4 Jan 2024 16:50:09 +0000 Received: from localhost ([127.0.0.1]:55556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQv2-0005V4-Rg for submit@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:09 -0500 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:61552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLQv0-0005To-5S for 68242@debbugs.gnu.org; Thu, 04 Jan 2024 11:50:07 -0500 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-4280e3ab14fso4219031cf.2 for <68242@debbugs.gnu.org>; Thu, 04 Jan 2024 08:50:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704386996; x=1704991796; 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=U1VUaYj9q2fqTmycjhUiIHy5KObjtlKMu8Eo6Cz5gUc=; b=kQpjiRTnPEMMP3HLCbu/ZqmTQUHa3TjNzNwNLrp21/S9CyFKrh2Cra48lrzmeH39rz k/oouXMO9HlNPKpoCVwhxHWOo4r8GlurTI2RZKC/ZH4C7bnLpe+Hjawo/b5XqLBn3aV0 Mn3sx1/5uQ7bWfllzoSUAAZ+Wogl+8HB6OzFo+g8qIazxu/ke/Z7thUyqy5LixVC8Afa 4/F0FuLTAAOywZSeVsvAlrXThB1wibuUoUh1/SFy2K4h5Itk1DNp9w1pOKM0O7KbMgnE n/Ix3J3IZMtafSQR20f55Pk59jWtahtyuAT6a3nJfZJJrOcI1OpCi+Ox8p+INLkqfmGI OZ4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704386996; x=1704991796; 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=U1VUaYj9q2fqTmycjhUiIHy5KObjtlKMu8Eo6Cz5gUc=; b=mWOqMntJw/KD87lNwM3nAmladlcy3tt1eT0VTXCTthdQ9B0LiKV3peQ3h2vzdIepJa LSeQyEVbBg0q+Nonol4IAjOGDgXaplQ1ta2r7gpj7eViSY8YEssyBuRKEKLUnTVkgW+o 4XFMaHloeAInULFuMMPergjX5hHGvlvX0CqCab0SvbbQe7ZGYswecnoyIjxSMl6U2L0H Bk1Iz+SdRbK8IWPiuNXtSVQIKCo/9MQ2knL4urMjs7T/uCumfqfYfxPrw2Vte3I/r54S RbOjNEV9cHuuIzE6HAi5exbJ/dJ2ZsIzOzEyEcO1aQ1fI9CYzF2tLWpZsiSIJqAPc5f7 TS8w== X-Gm-Message-State: AOJu0YyonF9InIXhn+cxTj+aSADqoTif3wUEBVU5horpgKHVm8G+YRU6 UbAqmLPVXaFliNRZp0Jvsk64ys4vMQIqDw== X-Google-Smtp-Source: AGHT+IF93doo9qXtuKzVZPx1eBU1ULGpuSqMPliUYCZG3gPA/Dex6NQ9C/hQHzmfqVzG6EdITS1UPA== X-Received: by 2002:a05:6214:262f:b0:680:d30a:d599 with SMTP id gv15-20020a056214262f00b00680d30ad599mr955397qvb.69.1704386996381; Thu, 04 Jan 2024 08:49:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 08:49:56 -0800 (PST) From: Maxim Cournoyer Date: Thu, 4 Jan 2024 11:48:21 -0500 Message-ID: <44d6f0f8471ad290a78c102228352481a131f60f.1704386901.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/man-db.scm (): Adjust comment. (abbreviate-file-name): Adjust regexp. (gz-compressed?, zstd-compressed?): New predicates. (entry->string): Use them. (man-page->entry): Adjust doc. Use input port reader appropriate to the compression type, if any. (man-files): Adjust regexp. (mandb-entries): Adjust link resolving predicate. * guix/profiles.scm (manual-database): Add guile-zlib extension. Change-Id: I6336e46e2d324c520a7d15d6cafd12bbf43c5b09 --- guix/man-db.scm | 45 +++++++++++++++++++++++++++++++++++---------- guix/profiles.scm | 8 ++++++-- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/guix/man-db.scm b/guix/man-db.scm index 7d9707a592..12887ce400 100644 --- a/guix/man-db.scm +++ b/guix/man-db.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2022, 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ (define-module (guix man-db) #:use-module (zlib) + #:use-module (zstd) #:use-module ((guix build utils) #:select (find-files)) #:use-module (gdbm) ;gdbm-ffi #:use-module (srfi srfi-9) @@ -48,7 +50,7 @@ (define-module (guix man-db) (define-record-type (mandb-entry file-name name section synopsis kind) mandb-entry? - (file-name mandb-entry-file-name) ;e.g., "../abiword.1.gz" + (file-name mandb-entry-file-name) ;e.g., "../abiword.1.zst" (name mandb-entry-name) ;e.g., "ABIWORD" (section mandb-entry-section) ;number (synopsis mandb-entry-synopsis) ;string @@ -63,7 +65,7 @@ (define (mandb-entrystring entry) "Return the wire format for ENTRY as a string." (match entry @@ -92,7 +102,11 @@ (define (entry->string entry) "\t-\t-\t" - (if (string-suffix? ".gz" file) "gz" "") + (cond + ((gzip-compressed? file) "gz") + ((zstd-compressed? file) "zst") + (else "")) + "\t" synopsis "\x00")))) @@ -148,7 +162,8 @@ (define (read-synopsis port) (loop (cons line lines)))))) (define* (man-page->entry file #:optional (resolve identity)) - "Parse FILE, a gzipped man page, and return a for it." + "Parse FILE, a gzip or zstd compressed man page, and return a +for it." (define (string->number* str) (if (and (string-prefix? "\"" str) (> (string-length str) 1) @@ -156,8 +171,13 @@ (define* (man-page->entry file #:optional (resolve identity)) (string->number (string-drop (string-drop-right str 1) 1)) (string->number str))) - ;; Note: This works for both gzipped and uncompressed files. - (call-with-gzip-input-port (open-file file "r0") + (define call-with-input-port* + (cond + ((gzip-compressed? file) call-with-gzip-input-port) + ((zstd-compressed? file) call-with-zstd-input-port) + (else call-with-port))) + + (call-with-input-port* (open-file file "r0") (lambda (port) (let loop ((name #f) (section #f) @@ -191,14 +211,19 @@ (define* (man-page->entry file #:optional (resolve identity)) (define (man-files directory) "Return the list of man pages found under DIRECTORY, recursively." ;; Filter the list to ensure that broken symlinks are excluded. - (filter file-exists? (find-files directory "\\.[0-9][a-z]?(\\.gz)?$"))) + (filter file-exists? + (find-files directory "\\.[0-9][a-z]?(\\.(gz|zst))?$"))) (define (mandb-entries directory) "Return mandb entries for the man pages found under DIRECTORY, recursively." (map (lambda (file) (man-page->entry file (lambda (link) - (let ((file (string-append directory "/" link - ".gz"))) - (and (file-exists? file) file))))) + (let ((file-gz (string-append directory "/" link + ".gz")) + (file-zst (string-append directory "/" link + ".zst"))) + (and (or (file-exists? file-gz) + (file-exists? file-zst) file) + file))))) (man-files directory))) diff --git a/guix/profiles.scm b/guix/profiles.scm index da7790d819..7fa5dab62a 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Huang Ying -;;; Copyright © 2017, 2021 Maxim Cournoyer +;;; Copyright © 2017, 2021, 2024 Maxim Cournoyer ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic @@ -1701,6 +1701,9 @@ (define* (manual-database manifest #:optional system) (define guile-zlib (module-ref (resolve-interface '(gnu packages guile)) 'guile-zlib)) + (define guile-zstd + (module-ref (resolve-interface '(gnu packages guile)) 'guile-zstd)) + (define modules (delete '(guix config) (source-module-closure `((guix build utils) @@ -1709,7 +1712,8 @@ (define* (manual-database manifest #:optional system) (define build (with-imported-modules modules (with-extensions (list gdbm-ffi ;for (guix man-db) - guile-zlib) + guile-zlib + guile-zstd) #~(begin (use-modules (guix man-db) (guix build utils) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 04 13:09:24 2024 Received: (at control) by debbugs.gnu.org; 4 Jan 2024 18:09:24 +0000 Received: from localhost ([127.0.0.1]:55688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLS9k-0003gE-9B for submit@debbugs.gnu.org; Thu, 04 Jan 2024 13:09:24 -0500 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:56329) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLS9i-0003fx-Hf for control@debbugs.gnu.org; Thu, 04 Jan 2024 13:09:22 -0500 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-42786514fe6so4251311cf.0 for ; Thu, 04 Jan 2024 10:09:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704391752; x=1704996552; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=uDrWT2lrlio1uZIu1+CUO9TePPVWZ/k2VTsGe8t5NE8=; b=CjGtzyRkusk5O2M+SnDeS4nLi45cLXIaJ/fF5JxAn4cBKkHSPTuBJXAECaADNDe9mZ KP5kv1occxKyIISIptx/lRybJKd4b4uRd6clagkgZcw7oQ70ho0X4BVwgancDNBold6d j4fwexgh3cRCPh9B5ZxkADYBidlhPwCAfMnR1rN4izhksML5x1/Wt9Tky5pGNdTSpZiL ZerwnwHNpnUa+qByWR8Y4hvAFQ/F6ltNO4uftAqXRG1a9oB43GO4Ggf8VNwWrmDLyfBp WyGMai1LzoXqTYIDCcWuIGkfH5m6X5hUb8teciP8vp7CskQGwkHvz6oM7JBg+reJ9NvC +V1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704391752; x=1704996552; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uDrWT2lrlio1uZIu1+CUO9TePPVWZ/k2VTsGe8t5NE8=; b=nXtkRdw6XZNtEpYr5l0LOalw5ynuLb+fLeNlZGondhz8QXj1yOn4eV4ldBhc03OInf LlnJUnYBDvg66rG4QSIJaLTK1TYyB5OGjfg6Q2b46mUD55diawyLzmHpdBaKvaoYHFls qpAgEnUuuGqVOrFu4X0BjKMSKepu+1wF0Yzu2/3vMAd836Co3DE4eSxjjWGDvGXlMOqL Tj7rZvWP3t+gOtuR2+ut1oyUIz9z4ZWM7e+OKYXKGev+BsDxo1H3NosTW5QKqzvXliEi ZyNFf39hs442bPg59smJkB9I6FeSctTseq7wnkceZEZMay3sPAI/wejPu7AduonpYwFs Wo6w== X-Gm-Message-State: AOJu0Yz2BKz4tEj415I03iUMYsgVSEYCbsgE77bFY8OJZInLR7DD/GAN tRKTHfm2E0jJBa4MAnxfVtr6DfhBR3lO5A== X-Google-Smtp-Source: AGHT+IH606q7Tb0fSbJFhsukEUbQ45KDRfwUlY/XKWPQj0VFJD1eC8qzEGgibNtzdKCsLtDNODyAhw== X-Received: by 2002:a05:622a:1baa:b0:428:472c:1844 with SMTP id bp42-20020a05622a1baa00b00428472c1844mr945919qtb.73.1704391752688; Thu, 04 Jan 2024 10:09:12 -0800 (PST) Received: from hurd (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id ke18-20020a05622a289200b004257bf9a394sm6938qtb.14.2024.01.04.10.09.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 10:09:12 -0800 (PST) Date: Thu, 04 Jan 2024 13:09:11 -0500 Message-Id: <87bka10y48.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #68242 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) retitle 68242 [core-updates] Compress man pages using zstd quit From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH core-updates v2 0/5] Compress man pages using zstd References: In-Reply-To: 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: Fri, 05 Jan 2024 19:54:01 +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.17044844142369 (code B ref 68242); Fri, 05 Jan 2024 19:54:01 +0000 Received: (at 68242) by debbugs.gnu.org; 5 Jan 2024 19:53:34 +0000 Received: from localhost ([127.0.0.1]:57956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqG5-0000c9-Lz for submit@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:33 -0500 Received: from mail-ot1-x336.google.com ([2607:f8b0:4864:20::336]:48340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqG2-0000br-So for 68242@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:33 -0500 Received: by mail-ot1-x336.google.com with SMTP id 46e09a7af769-6dc759c8ddbso1079453a34.0 for <68242@debbugs.gnu.org>; Fri, 05 Jan 2024 11:53:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704484400; x=1705089200; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=J7vidqyn5IbWHxYuL9AeUn+ya3fN5/SArsw5wZo1gto=; b=gHXi0v+ykbfHmWWwmEmxFVF838b/YzXtSjmHbTelx0Ldi//5A+VGCuE9oSITg/i3oA y0mwdPsH2j40CeVSr963sNEvlSSnxf4ktn0UkTI8zxVWPigCHDc83N+B0Ih8TXkLpoht djI4uCufJFMtV3SVAMOrsQtIzJ+QjKVIAiBX3CbXkSYcbSpCg0J6oxg3fYZ65BSHGONP gGs60eGMOOvfY3vlAg2f7zF6crILPz0DnXrumGawGDvJ2+8eRL4nO6yEJ/AedsD/50R+ AneLPUrcnu5T69XtwZaTkiMIrWiCafAGoO1veWPXEnn6NEXn0iZ0GZPDUyJU1YAA7sXv MrLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704484400; x=1705089200; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=J7vidqyn5IbWHxYuL9AeUn+ya3fN5/SArsw5wZo1gto=; b=PPko3PntVw7SuzG6n6RFDnT6fUFZdiwCkZgmmhWPOzYQQf3POWBT+wBg6XwrPn/kGU Kt7dJY1FWaapNtx7KcGzfaUuxjLAewOX/IUdAbZ0uHVV0ios6xMvhFWF5ZxKbNO5HV5Z LQGEBRVPp3vW7kdqy8nRcjw9qBBNMzLfGJ5Lt3vYud0TB9NaU1xiYiPcGEAaOPFJxecw 8b3TByfLuO2XHBvOK+WZyR8UdxmN2h3N5U3kH51IS+W3rceNFJtarXn4OlJI0sKQVQXc 1Z6bDUpI1vySbTPyAxJV8hIzm3XhgZscCVskToqtE8OjbltAt68IjGjxOmPPTsxerbMg cfXQ== X-Gm-Message-State: AOJu0Yzz0Kw3QXaXAGzJaTtFvP5rqkQjACJDnaZn29c1LGBFnTRLz1nO 0TLJu8SA6gYmScFENkUuYbyMtV95tnQ= X-Google-Smtp-Source: AGHT+IGJpLtqlPB2chE+HfmqDttAJ5Hf2z4pCLIEjLvhKdaArB/PuGb3K7gU637tqzBGoRcLEd5DZw== X-Received: by 2002:a05:6830:1e49:b0:6dc:beab:da36 with SMTP id e9-20020a0568301e4900b006dcbeabda36mr833885otj.35.1704484400161; Fri, 05 Jan 2024 11:53:20 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id c22-20020a05620a11b600b00781e1c466e7sm823178qkk.24.2024.01.05.11.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 11:53:19 -0800 (PST) From: Maxim Cournoyer Date: Fri, 5 Jan 2024 14:52:49 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This series changes the compressor of our man pages from gzip to zstd, which decompresses much faster, and compresses better at the chosen level (19). Changes in v2: - Turn string->number into number->string Maxim Cournoyer (5): utils: Lower xz compression memory usage limit to 20%. compression: Enable zstd parallel compression. packages: Repack patched source archives via zstd by default. build: gnu-build-system: Compress man pages with zstd. man-db: Add support for zstd compressed man pages. gnu/compression.scm | 3 +- gnu/packages/commencement.scm | 3 +- guix/build/gnu-build-system.scm | 73 +++++++++++++++++++++------------ guix/build/utils.scm | 3 +- guix/man-db.scm | 45 +++++++++++++++----- guix/packages.scm | 50 ++++++++++++---------- guix/profiles.scm | 8 +++- 7 files changed, 123 insertions(+), 62 deletions(-) base-commit: 54d122a12b6b9f0bf2f20fe2c5e2c6549bc9909d -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH core-updates v2 2/5] compression: Enable zstd parallel compression. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 19:54:02 +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 Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.17044844162389 (code B ref 68242); Fri, 05 Jan 2024 19:54:02 +0000 Received: (at 68242) by debbugs.gnu.org; 5 Jan 2024 19:53:36 +0000 Received: from localhost ([127.0.0.1]:57959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqG8-0000cT-11 for submit@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:36 -0500 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:60639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqG6-0000bx-D0 for 68242@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:34 -0500 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-781600ab3d8so132804385a.0 for <68242@debbugs.gnu.org>; Fri, 05 Jan 2024 11:53:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704484404; x=1705089204; 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=tneTWMQJp/iJi+zlwLYnjycGc1BxzYlhSwN2fmbNXbE=; b=OqZrv8fQY1bhBm7eBdvRTu88GdnSQZ3Qtg9YaN23K1uvOsw5lKxWziriqCAi3jQ4t5 ug728P8zxvFGIuRAjbIfpiDpicM8OXJvX0c9FYa+WO/4yWOB0u/f9EsjaWn5J4rYXq5c DmrNcs3Ej1sUNe/LKaZNrVyG6Yq/HNeJVp2q5ySwX3Q9ChmKdur6yu0xPhYKmlhIltQp fS19OvOCI5gJuN//Rl3xUJyivLGDmtjgPQIJUJc609tijFVuU62mSnTTbKQMyzH3pslA 3roz4bePlWR7xebhenfj7+IkiBTaR5S1r1ICwCNl6+S1wJa6OgLrfNduaRI5lnUKM6Jb l54g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704484404; x=1705089204; 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=tneTWMQJp/iJi+zlwLYnjycGc1BxzYlhSwN2fmbNXbE=; b=LXF01IuSalP8BaAKgjyBd8ulKFT8sQOkiVlEUvoJCHPI73up6i30DuJOIcu0X7ZEdy rl3/oOW2Rl3wSlSch0jMOkB6vKZ39zOsasdjTV6Ee4g2OFlCd1R5TaNvSaa7zMobBb0k bfPSfuNRYRsL4Dyhp0wErb1fLZmnr8jYb9aaTvdwxFEnf0NCUmKjVmO5O6NI95EtehTA DJIBl/SIbMPd/43sn+nYJ8hF+8lFgTz43V8Cz/f4njyyUrlNNSctLOexgVbdKm3PyPGe Ek/HAZxpImT/8NYAhDPbX7XFvnSqBqvmMeDoIcjcW7YaSlD+56HILlhy+gmopmbxDrtW PZ9g== X-Gm-Message-State: AOJu0YzI9+7eAgqT4ZpdXi1rg/RoxJWq51h8vm2SqYY9w0by4cIHeUFs Cgytq7J30/Klo+OpujfdhTq7aABEp0k= X-Google-Smtp-Source: AGHT+IGXaaRI/DAhlopWOKWpBodOXBUgPRja6D2vHXoR4FOTbviY6bj8YV/h+YN9JehMihhmaEfjJQ== X-Received: by 2002:a05:620a:8223:b0:782:b6a1:cc97 with SMTP id ow35-20020a05620a822300b00782b6a1cc97mr2908113qkn.19.1704484403998; Fri, 05 Jan 2024 11:53:23 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id c22-20020a05620a11b600b00781e1c466e7sm823178qkk.24.2024.01.05.11.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 11:53:23 -0800 (PST) From: Maxim Cournoyer Date: Fri, 5 Jan 2024 14:52:51 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/compression.scm (%compressors) [zstd]: Provide the --threads argument. Change-Id: I4e8dfe725d1b0721c0016c3013b9e609fee94367 --- (no changes since v1) gnu/compression.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/compression.scm b/gnu/compression.scm index 0418e80a15..6e48de5979 100644 --- a/gnu/compression.scm +++ b/gnu/compression.scm @@ -56,7 +56,8 @@ (define %compressors ;; The default level 3 compresses better than gzip in a ;; fraction of the time, while the highest level 19 ;; (de)compresses more slowly and worse than xz. - #~(list #+(file-append zstd "/bin/zstd") "-3")) + #~(list #+(file-append zstd "/bin/zstd") "-3" + (format #f "--threads=~a" (parallel-job-count)))) (compressor "none" "" #f))) (define (lookup-compressor name) -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH core-updates v2 1/5] utils: Lower xz compression memory usage limit to 20%. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 19:54:02 +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 Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.17044844182403 (code B ref 68242); Fri, 05 Jan 2024 19:54:02 +0000 Received: (at 68242) by debbugs.gnu.org; 5 Jan 2024 19:53:38 +0000 Received: from localhost ([127.0.0.1]:57962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqGA-0000ch-Ay for submit@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:38 -0500 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:49576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqG4-0000bu-VF for 68242@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:35 -0500 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-78117e97becso105458085a.3 for <68242@debbugs.gnu.org>; Fri, 05 Jan 2024 11:53:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704484402; x=1705089202; 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=nPaGytFP2GBEUwTHQTSZm5fTrRJgcqu0JymPnfzZhsk=; b=U+Q8cmEOFVgilPLe7bg+P4U3oZ/F6IO78hcVSk9jQABMth2DLh/Wg/H6sihBdUBhCK kx8hONFkybyk/g65H85jLDHKULgEymeZjALR1I6PzorjBj3T2ir4PdqwtpMxYwnbBGAp avdnNIHd60w1aMcbcAyaALwL4GClDjqQHwdvob0Sts9Gdw9ITslj4VTEW7X6+Q9eVzEx 8kka04iRNeZBTZUD2ZwnOOKMPLUVNaBDABFBTS/5LP7A3371GIsr3Yynd6Fa6WP3biN+ 9pXO4SjccjTe5823jYSIipBcO10eVC5Q4bH7LVLTZLd3e13AC+dxG01wAxz8n/otaD+U B8bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704484402; x=1705089202; 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=nPaGytFP2GBEUwTHQTSZm5fTrRJgcqu0JymPnfzZhsk=; b=c6KKq2Ak3GOvo5aSMEjG1/yOza0fUPO9LyRBvIFevAWndhtixFn8+4ad8MeAaCjJnq nWhu4rp1nd2i8JFWFYDPu7GpplgggzTvw2dRhy4w++6QhYuw0NK+nHV7j0Kzg1EJdO8i aRuTwuhDQrAtgAEYynUoNVkXD84YQsfjv9W1akFtskV82CxbbKkFBFvanBl5dsoxd0uM 9Wy1bjTkBHyI7+bn5ad8WUN8OAvPlWF+YHwl1MR7JwPeGLokav4PUj/abHRQI+cqroRJ U37MlMWuRAvOseeT8RSo/78WDqwK4GrNtkawTrO4Kabc/26DOVQy+LLibH+bmV9joRMk WdYA== X-Gm-Message-State: AOJu0YwS5GwSO3AiZoCg286YCTw6JwudL/SiAtBiCudoTfxNHxcnZsj8 aXIrueicaAplPCdqVvLEyPzOWuKP3aQ= X-Google-Smtp-Source: AGHT+IHu8+6PIKtxz5wqlAqw/zdYcEkEU6WdzyLNfkwkiSyxyrBpekFKrXAHhHK/Yp1Hlt/QXE/+8Q== X-Received: by 2002:a05:620a:244e:b0:781:ea60:b466 with SMTP id h14-20020a05620a244e00b00781ea60b466mr2876560qkn.119.1704484402225; Fri, 05 Jan 2024 11:53:22 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id c22-20020a05620a11b600b00781e1c466e7sm823178qkk.24.2024.01.05.11.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 11:53:21 -0800 (PST) From: Maxim Cournoyer Date: Fri, 5 Jan 2024 14:52:50 -0500 Message-ID: <2d37c22fc834b1062c456c8b23974d9be5a2ff56.1704484373.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) There were sometimes out of memory errors on the Berlin build farm, especially for i686 or arm machines having less memory. * guix/build/utils.scm (%xz-parallel-args): Reduce --memlimit value from 50% to 20%. Change-Id: If848bed92ef4c42d11a96057e59ee51a019d0573 --- (no changes since v1) guix/build/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 8e630ad586..e87066cc02 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -186,7 +186,7 @@ (define (tarball? file-name) (define (%xz-parallel-args) "The xz arguments required to enable bit-reproducible, multi-threaded compression." - (list "--memlimit=50%" + (list "--memlimit=20%" (format #f "--threads=~a" (max 2 (parallel-job-count))))) -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH core-updates v2 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: Fri, 05 Jan 2024 19:54: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.17044844212423 (code B ref 68242); Fri, 05 Jan 2024 19:54:03 +0000 Received: (at 68242) by debbugs.gnu.org; 5 Jan 2024 19:53:41 +0000 Received: from localhost ([127.0.0.1]:57966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqGC-0000cw-Kb for submit@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:41 -0500 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:58371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqG8-0000c0-Dy for 68242@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:38 -0500 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-781edcbb495so122176385a.0 for <68242@debbugs.gnu.org>; Fri, 05 Jan 2024 11:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704484406; x=1705089206; 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=WY2zrLmbm2SWhH3iTQSppY95X01nFe/0vLW/hINWGpY=; b=RslV6L+NmmK55zwrHqfyRAQAn6iNRQw6UzBh7HwUUmH2YTBEjV7rSemKjdXscRGl+j vaAMHpYr599RMWr6c09i/EWh4Xxr9C/6aVibU/BHyBwCspUtCdCaszbMrX+5o4sdmTyc 4eqMQ51D2eNGwNo6CPflV4IOhKPREbm1haKdotvarQhXA1NcIWvh6wwDZNp0H8kCcAEC lcyS8QDlt+n+ZZG0Zphtb/CA1Gi7rlXOJjdWCmeRA+6WmE5uEY7zvxL/B6hTPNUtc4KS ohlxByM5624U0Txt0Eet5fnIcpCM9aLfx/e4Q1IQnUPKo3nHPm78xR3i8msqW92hO7Oz JCeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704484406; x=1705089206; 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=WY2zrLmbm2SWhH3iTQSppY95X01nFe/0vLW/hINWGpY=; b=p5v7UfjU59dsmdM7tXwP3+RKJqIV2bTNMJiN6Yimj1i1T4+FBB9nDGWHp4/a54hwku kxjrcXNUHBr6k3TcUbw3t+Kl95Tp1W6MXgQ2gwvrgkcByrOjSCxKezemNRttcEZowVx6 /XGgbx7eibI8cHB+qAy/7H7WJSXXWyxNia9/E6EpgGm5PjR3YxvM7xuxpv3Fy6d6Y+vy cq69GejHLznQfZc267NtLLsUiACzZQNw8GJdMxOXr6/NrAi7R7IfwhAs6Lj5TzL25ehi trC102T0eSyzAWdVFDsyINrRQVQlVQzpVNxScAipBhePS19qq/uTLkQkvAe/B4RmGwS+ UQLg== X-Gm-Message-State: AOJu0YwY8L6d58B6iBZARbfaDUTYpu3lTYxol9q9NdDtn4e+6x9bD8o4 j457GRHWML7SgUPsXaMizJiWem8TVa8= X-Google-Smtp-Source: AGHT+IGhUk0H4MjbPJhSlibPFyo4UzPrv900qr1r0x/K7mJjRFamDtAyijA1UqIyEDyYspIZdEYqIg== X-Received: by 2002:a05:620a:6019:b0:783:7df:7c7c with SMTP id dw25-20020a05620a601900b0078307df7c7cmr1771022qkb.67.1704484406124; Fri, 05 Jan 2024 11:53:26 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id c22-20020a05620a11b600b00781e1c466e7sm823178qkk.24.2024.01.05.11.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 11:53:25 -0800 (PST) From: Maxim Cournoyer Date: Fri, 5 Jan 2024 14:52:52 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 --- (no changes since v1) 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 -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH core-updates v2 4/5] build: gnu-build-system: Compress man pages with zstd. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 19:54: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 Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.17044844222433 (code B ref 68242); Fri, 05 Jan 2024 19:54:03 +0000 Received: (at 68242) by debbugs.gnu.org; 5 Jan 2024 19:53:42 +0000 Received: from localhost ([127.0.0.1]:57968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqGD-0000d0-7l for submit@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:41 -0500 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:59887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqGA-0000c4-FM for 68242@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:39 -0500 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7815547f2c5so121356085a.3 for <68242@debbugs.gnu.org>; Fri, 05 Jan 2024 11:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704484408; x=1705089208; 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=x+mVD14beS+srRzXQtAc4+5pf7mOTb9TfWsqvebFxF0=; b=Vzy3nzrAxKM0D0sovpmbhDwlDd9pm+cAqvbz/lmR7R/OVTFUaleeK9vDj0+GHsm4wA e60bxMQLMlFK5HUxC9Ym6ekFhEpfvpOjh+C39D7wy+hbDD7gs6phusBd/zQVNFzfhYrf YuJoCHQnQE7YkBS7cv+i5Pq22WuMr6Ue+WiC8iGr/6LoNn6YmdaTh76brXfCrGva4N9Q 6Nj9fRtioxFhfE9C5YLEofnCPDJUrOYrXxcSaw/Xm/gZd3gAB2nf0/szXNKcGcyc1D68 BfOWDPzOSMWB6HqtgEQz6cMgJwJDFMdZNZGBcBWmfUQnwO9S2RmsE234Y6odlgjK1U0o nqyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704484408; x=1705089208; 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=x+mVD14beS+srRzXQtAc4+5pf7mOTb9TfWsqvebFxF0=; b=QjWXQOA6paHJPY2AAJGI3whMTRmZBAWY1lF4za5i5LNIx28RJcZY410md8hqrOXb5s hvDqOk3PmXT+oMuSjVpgTNX2tgPWamB3kuKoCAMDdJUaMdVGu7jgaBfPuAfIdWrZGWU5 86uxfxkG3w/JJOdzG82sbK1xvVI0Z9+y2pGf4xwkSYmyTcmg9CK9NhrNXrUiLi4K0wyO RP2ryWVk0euMpTRlSi7F2moGmcmA1UsPj2nnZ0AByYZgPcOtiEU48qqz3Qomtrv22jre gdHsiOZx93WMHSk8mj3TeJwRkBhe/1MFkT6tjW6xB7XlsAVkKmiPJjNRP/0ZEXhpLcek HEBg== X-Gm-Message-State: AOJu0Yxe+KCYglo/6y64OOCUo43KCfJDS+/RG1YtjCzTnwEMp64gW2gO qNADm1kT+8r+ZUtdOoZG8jGEKycFGGE= X-Google-Smtp-Source: AGHT+IFfQVoYp4D+zc9rd2tXWxb9vfa3iNBCYH7Il+4IE/xlrWDytrwrs/Xe8d22VzKucwUgm6YKYw== X-Received: by 2002:a05:620a:7ef:b0:781:25aa:21fd with SMTP id k15-20020a05620a07ef00b0078125aa21fdmr2220556qkk.72.1704484407970; Fri, 05 Jan 2024 11:53:27 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id c22-20020a05620a11b600b00781e1c466e7sm823178qkk.24.2024.01.05.11.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 11:53:27 -0800 (PST) From: Maxim Cournoyer Date: Fri, 5 Jan 2024 14:52:53 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The aim is to improve the efficiency of computing the man pages database, which must decompress the man pages. Zstd is faster than gzip, especially for decompression, and has a similar compression ratio. * gnu/packages/commencement.scm (%final-inputs): Add zstd. * guix/build/gnu-build-system.scm (compress-documentation) Update doc. : New arguments. : Rename argument to... : ... this. Add an 'extension' argument to the retarget-symlink nested procedure. Use new arguments in nested 'maybe-compress' procedure. Change-Id: Ibaad4658f8e5151633714d263d9198f56d255020 --- Changes in v2: - Turn string->number into number->string gnu/packages/commencement.scm | 3 +- guix/build/gnu-build-system.scm | 73 +++++++++++++++++++++------------ 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ae1c91f0d0..51c26339ef 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3492,7 +3492,8 @@ (define-public %final-inputs (native-inputs (list (if (target-hurd?) glibc-utf8-locales-final/hurd - glibc-utf8-locales-final))))))) + glibc-utf8-locales-final))))) + ("zstd" ,zstd))) ("sed" ,sed-final) ("grep" ,grep-final) ("xz" ,xz-final) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 51b8f9acbf..2f0ffe36fc 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2020 Brendan Tildesley -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -644,21 +644,36 @@ (define* (reset-gzip-timestamps #:key outputs #:allow-other-keys) (((names . directories) ...) (for-each process-directory directories)))) -(define* (compress-documentation #:key outputs +(define* (compress-documentation #:key + outputs (compress-documentation? #t) - (documentation-compressor "gzip") - (documentation-compressor-flags + (info-compressor "gzip") + (info-compressor-flags '("--best" "--no-name")) - (compressed-documentation-extension ".gz") + (info-compressor-file-extension ".gz") + (man-compressor (if (which "zstd") + "zstd" + info-compressor)) + (man-compressor-flags + (if (which "zstd") + (list "-19" "--rm" + "--threads" (number->string + (parallel-job-count))) + info-compressor-flags)) + (man-compressor-file-extension + (if (which "zstd") + ".zst" + info-compressor-file-extension)) #:allow-other-keys) - "When COMPRESS-DOCUMENTATION? is true, compress man pages and Info files -found in OUTPUTS using DOCUMENTATION-COMPRESSOR, called with -DOCUMENTATION-COMPRESSOR-FLAGS." - (define (retarget-symlink link) + "When COMPRESS-INFO-MANUALS? is true, compress Info files found in OUTPUTS +using INFO-COMPRESSOR, called with INFO-COMPRESSOR-FLAGS. Similarly, when +COMPRESS-MAN-PAGES? is true, compress man pages files found in OUTPUTS using +MAN-COMPRESSOR, using MAN-COMPRESSOR-FLAGS." + (define (retarget-symlink link extension) (let ((target (readlink link))) (delete-file link) - (symlink (string-append target compressed-documentation-extension) - (string-append link compressed-documentation-extension)))) + (symlink (string-append target extension) + (string-append link extension)))) (define (has-links? file) ;; Return #t if FILE has hard links. @@ -676,23 +691,23 @@ (define* (compress-documentation #:key outputs (symbolic-link? target-absolute)) (lambda args (if (= ENOENT (system-error-errno args)) - (begin - (format (current-error-port) - "The symbolic link '~a' target is missing: '~a'\n" - symlink target-absolute) - #f) + (format (current-error-port) + "The symbolic link '~a' target is missing: '~a'\n" + symlink target-absolute) (apply throw args)))))) - (define (maybe-compress-directory directory regexp) + (define (maybe-compress-directory directory regexp + compressor + compressor-flags + compressor-extension) (when (directory-exists? directory) (match (find-files directory regexp) - (() ;nothing to compress + (() ;nothing to compress #t) - ((files ...) ;one or more files + ((files ...) ;one or more files (format #t "compressing documentation in '~a' with ~s and flags ~s~%" - directory documentation-compressor - documentation-compressor-flags) + directory compressor compressor-flags) (call-with-values (lambda () (partition symbolic-link? files)) @@ -702,20 +717,26 @@ (define* (compress-documentation #:key outputs ;; unchanged ('gzip' would refuse to compress them anyway.) ;; Also, do not retarget symbolic links pointing to other ;; symbolic links, since these are not compressed. - (for-each retarget-symlink + (for-each (cut retarget-symlink <> compressor-extension) (filter (lambda (symlink) (and (not (points-to-symlink? symlink)) (string-match regexp symlink))) symlinks)) - (apply invoke documentation-compressor - (append documentation-compressor-flags + (apply invoke compressor + (append compressor-flags (remove has-links? regular-files))))))))) (define (maybe-compress output) (maybe-compress-directory (string-append output "/share/man") - "\\.[0-9]+$") + "\\.[0-9]+$" + man-compressor + man-compressor-flags + man-compressor-file-extension) (maybe-compress-directory (string-append output "/share/info") - "\\.info(-[0-9]+)?$")) + "\\.info(-[0-9]+)?$" + info-compressor + info-compressor-flags + info-compressor-file-extension)) (if compress-documentation? (match outputs -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [PATCH core-updates v2 5/5] man-db: Add support for zstd compressed man pages. 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: Fri, 05 Jan 2024 19:54:04 +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.17044844222440 (code B ref 68242); Fri, 05 Jan 2024 19:54:04 +0000 Received: (at 68242) by debbugs.gnu.org; 5 Jan 2024 19:53:42 +0000 Received: from localhost ([127.0.0.1]:57970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqGE-0000dD-0F for submit@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:42 -0500 Received: from mail-yw1-x1134.google.com ([2607:f8b0:4864:20::1134]:50437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLqGC-0000cM-BK for 68242@debbugs.gnu.org; Fri, 05 Jan 2024 14:53:41 -0500 Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-5f6b77c4743so1033137b3.1 for <68242@debbugs.gnu.org>; Fri, 05 Jan 2024 11:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704484410; x=1705089210; 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=BPx8/9xAygxLze+IkhW71JXdJJCMX0EatZkvKj/wqUY=; b=cjp/pn43n11L4jcgPu2pfCdb2ylf1q7a2ozOyhKiQhjigxDIxzVIk4n/02poYf5w08 AtQIlSl6wxtGawUo+cupkEk1leK9BmuOroAQjQtfzgwbwtJmw4EsN0Ni0P0msksRnjrC TYWw8mMIQ6k0X0dvGmZoYY5CIxY9NoSXulS4Rw0dyHGW+7zQhHVkaa+K3dLW+MkCjm++ y3vc0a9iwNMU0ibGzoMwFagQeBQOqaYrfRhlCeFCrr1DGOKLt/z+Ft00YwDa9/uP9ttT tcPHOPJZCsPVzO24bLodpeoxYl0IKau03dQr1O5kJUBUIrqhCuilJZKfZEpbcdhNATyS XXLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704484410; x=1705089210; 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=BPx8/9xAygxLze+IkhW71JXdJJCMX0EatZkvKj/wqUY=; b=sq9fsqdkbucjFRryoGQGTqv/pVnyv5C7PxUsSlKJlUZ4kKXpY8qmHI9LvvxPvOZl59 PpqAgq3MDBz6091ngDS7RwzeX2VnJYyi8imfD5iZMG2AFbYdEm9YPiXCsbTr+jBH/l41 Jk4vjFe6vEQH8qUVtBFbJmP+Qz68QB7kcdJyFStQv4G0GLV7OkxYFnGkQd6w9e9TSbdd Nv9Ol6e06qa7jAj3evs+eLGdD19B1UFya2/sP1Xc8RE/uAFOsg96NxvsM4Pv+wEB9Gbz 91Fk/KhU+p1PHNtzB4+q5/D8+7LNSnwVlEf5J2aF0wOQrBH0tsuPpP3e0f+IxNYmPbDg EYtg== X-Gm-Message-State: AOJu0Yy5AEli18srgdSYeM0CveiJ293vWrH/ob/h+5n+X2e/BiCYqi/9 gGdHGLmCLvkku/yZ+prCsH+BzbnQ2Eg= X-Google-Smtp-Source: AGHT+IEXr7/7wG5sHf09XyHirbEA2huiXq8aIe78cia9NWDIWLfa6V9PhtyKMmJ/7q0SrblFCtVRmQ== X-Received: by 2002:a81:71d7:0:b0:5ef:f83d:ab23 with SMTP id m206-20020a8171d7000000b005eff83dab23mr3120037ywc.5.1704484409867; Fri, 05 Jan 2024 11:53:29 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id c22-20020a05620a11b600b00781e1c466e7sm823178qkk.24.2024.01.05.11.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 11:53:29 -0800 (PST) From: Maxim Cournoyer Date: Fri, 5 Jan 2024 14:52:54 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/man-db.scm (): Adjust comment. (abbreviate-file-name): Adjust regexp. (gz-compressed?, zstd-compressed?): New predicates. (entry->string): Use them. (man-page->entry): Adjust doc. Use input port reader appropriate to the compression type, if any. (man-files): Adjust regexp. (mandb-entries): Adjust link resolving predicate. * guix/profiles.scm (manual-database): Add guile-zlib extension. Change-Id: I6336e46e2d324c520a7d15d6cafd12bbf43c5b09 --- (no changes since v1) guix/man-db.scm | 45 +++++++++++++++++++++++++++++++++++---------- guix/profiles.scm | 8 ++++++-- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/guix/man-db.scm b/guix/man-db.scm index 7d9707a592..12887ce400 100644 --- a/guix/man-db.scm +++ b/guix/man-db.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2022, 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ (define-module (guix man-db) #:use-module (zlib) + #:use-module (zstd) #:use-module ((guix build utils) #:select (find-files)) #:use-module (gdbm) ;gdbm-ffi #:use-module (srfi srfi-9) @@ -48,7 +50,7 @@ (define-module (guix man-db) (define-record-type (mandb-entry file-name name section synopsis kind) mandb-entry? - (file-name mandb-entry-file-name) ;e.g., "../abiword.1.gz" + (file-name mandb-entry-file-name) ;e.g., "../abiword.1.zst" (name mandb-entry-name) ;e.g., "ABIWORD" (section mandb-entry-section) ;number (synopsis mandb-entry-synopsis) ;string @@ -63,7 +65,7 @@ (define (mandb-entrystring entry) "Return the wire format for ENTRY as a string." (match entry @@ -92,7 +102,11 @@ (define (entry->string entry) "\t-\t-\t" - (if (string-suffix? ".gz" file) "gz" "") + (cond + ((gzip-compressed? file) "gz") + ((zstd-compressed? file) "zst") + (else "")) + "\t" synopsis "\x00")))) @@ -148,7 +162,8 @@ (define (read-synopsis port) (loop (cons line lines)))))) (define* (man-page->entry file #:optional (resolve identity)) - "Parse FILE, a gzipped man page, and return a for it." + "Parse FILE, a gzip or zstd compressed man page, and return a +for it." (define (string->number* str) (if (and (string-prefix? "\"" str) (> (string-length str) 1) @@ -156,8 +171,13 @@ (define* (man-page->entry file #:optional (resolve identity)) (string->number (string-drop (string-drop-right str 1) 1)) (string->number str))) - ;; Note: This works for both gzipped and uncompressed files. - (call-with-gzip-input-port (open-file file "r0") + (define call-with-input-port* + (cond + ((gzip-compressed? file) call-with-gzip-input-port) + ((zstd-compressed? file) call-with-zstd-input-port) + (else call-with-port))) + + (call-with-input-port* (open-file file "r0") (lambda (port) (let loop ((name #f) (section #f) @@ -191,14 +211,19 @@ (define* (man-page->entry file #:optional (resolve identity)) (define (man-files directory) "Return the list of man pages found under DIRECTORY, recursively." ;; Filter the list to ensure that broken symlinks are excluded. - (filter file-exists? (find-files directory "\\.[0-9][a-z]?(\\.gz)?$"))) + (filter file-exists? + (find-files directory "\\.[0-9][a-z]?(\\.(gz|zst))?$"))) (define (mandb-entries directory) "Return mandb entries for the man pages found under DIRECTORY, recursively." (map (lambda (file) (man-page->entry file (lambda (link) - (let ((file (string-append directory "/" link - ".gz"))) - (and (file-exists? file) file))))) + (let ((file-gz (string-append directory "/" link + ".gz")) + (file-zst (string-append directory "/" link + ".zst"))) + (and (or (file-exists? file-gz) + (file-exists? file-zst) file) + file))))) (man-files directory))) diff --git a/guix/profiles.scm b/guix/profiles.scm index da7790d819..7fa5dab62a 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Huang Ying -;;; Copyright © 2017, 2021 Maxim Cournoyer +;;; Copyright © 2017, 2021, 2024 Maxim Cournoyer ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic @@ -1701,6 +1701,9 @@ (define* (manual-database manifest #:optional system) (define guile-zlib (module-ref (resolve-interface '(gnu packages guile)) 'guile-zlib)) + (define guile-zstd + (module-ref (resolve-interface '(gnu packages guile)) 'guile-zstd)) + (define modules (delete '(guix config) (source-module-closure `((guix build utils) @@ -1709,7 +1712,8 @@ (define* (manual-database manifest #:optional system) (define build (with-imported-modules modules (with-extensions (list gdbm-ffi ;for (guix man-db) - guile-zlib) + guile-zlib + guile-zstd) #~(begin (use-modules (guix man-db) (guix build utils) -- 2.41.0 From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [core-updates] Compress man pages using zstd Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 17:27:01 +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: Maxim Cournoyer Cc: Josselin Poiret , 68242@debbugs.gnu.org, Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Ricardo Wurmus , Christopher Baines Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.17047347686851 (code B ref 68242); Mon, 08 Jan 2024 17:27:01 +0000 Received: (at 68242) by debbugs.gnu.org; 8 Jan 2024 17:26:08 +0000 Received: from localhost ([127.0.0.1]:37475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtO4-0001mR-DL for submit@debbugs.gnu.org; Mon, 08 Jan 2024 12:26:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtO2-0001lj-Rs for 68242@debbugs.gnu.org; Mon, 08 Jan 2024 12:26:07 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMtNr-0004XU-63; Mon, 08 Jan 2024 12:25:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=WQLa9079Crwl6Q6cDnXbVrNZJpM4TZ4es1vURXnM+BY=; b=U1DoST6MN9mwsQWpzAka rrqNOzwxbLNBD/rZclK2Y9ZN3+1KLoTzB+cp/gexIw0JCjHNrE0kSUU6nkitgsuQ1NBV/ydTkpfQM lCbt5O0YhoHfF/o58psh1kq3J+VGfQjk1Tvpc2wyISIFbbEFj0nqEFIad5/VZ+XakZ2rlMwUr5eOB tjx8oE/IYy7ZlW+LRXyQq5Bvy8jOKhpX9bY6MRPGZu/w1HWR9cNw4HmhqPaKEo/V3OgqrFo6Ve61W VTZJHttf00+hFezarmpDzxIsll/ojvhfnWViyd8+I+jLyPcWmvkpGIspQZRvksCzmvzn87hcgdE+l mAKXQwW0kWJtKg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Maxim Cournoyer's message of "Fri, 5 Jan 2024 14:52:52 -0500") References: Date: Mon, 08 Jan 2024 18:25:46 +0100 Message-ID: <87r0ir3ffp.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Maxim Cournoyer skribis: > * 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. Fallba= ck to > xz when zstd is not available. > > Change-Id: I614a6be8c87a4a0858eadce616c51d8e9b9fc020 Good idea. LGTM! Ludo=E2=80=99. From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [core-updates] Compress man pages using zstd Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 17:27:02 +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: Maxim Cournoyer Cc: 68242@debbugs.gnu.org Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.17047348036905 (code B ref 68242); Mon, 08 Jan 2024 17:27:02 +0000 Received: (at 68242) by debbugs.gnu.org; 8 Jan 2024 17:26:43 +0000 Received: from localhost ([127.0.0.1]:37480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtOc-0001nI-NR for submit@debbugs.gnu.org; Mon, 08 Jan 2024 12:26:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtOa-0001n5-Q6 for 68242@debbugs.gnu.org; Mon, 08 Jan 2024 12:26:41 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMtOO-0004nk-V6; Mon, 08 Jan 2024 12:26:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=EaUfTyx3AEFAlxgemiOiHHd2a9vITYON8hAzy1hfgkc=; b=o5ObT2qzatKjQKp2Ye15 haZqcOXF0DMEX+SV8L3hRylxM92tKsJMXFCJ5DoA1t/vgvw9URsg392BX15WKxr2zEbZOqNjiU3mz gEJpbgWRxU7ncGkplN6rIMGBvyTg/hiiGnXbASNP3eVtf4QpAQ8xul6RFBdzf8N6N57owrTew+lZD ZI5gI9onxrctFlr0lUlo4Z/3pIPEskxdh/XnLNCPirc9hxdO4foCYkzDL5+zu5ACagPMwCBJVWhxT zDj3gQMbBG9Ou9sG8VmlDccsrYqObokJIh2wJotxQ5eAlWiZA0vG5s83k2XI+0FwW7cfpBCUxPmKM 1meYsNgRqXWB1w==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Maxim Cournoyer's message of "Fri, 5 Jan 2024 14:52:51 -0500") References: Date: Mon, 08 Jan 2024 18:26:25 +0100 Message-ID: <87mstf3fem.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > * gnu/compression.scm (%compressors) [zstd]: Provide the --threads argument. > > Change-Id: I4e8dfe725d1b0721c0016c3013b9e609fee94367 LGTM. From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [core-updates] Compress man pages using zstd Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 17:27:02 +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: Maxim Cournoyer Cc: 68242@debbugs.gnu.org Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.17047348206936 (code B ref 68242); Mon, 08 Jan 2024 17:27:02 +0000 Received: (at 68242) by debbugs.gnu.org; 8 Jan 2024 17:27:00 +0000 Received: from localhost ([127.0.0.1]:37484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtOu-0001nn-0N for submit@debbugs.gnu.org; Mon, 08 Jan 2024 12:27:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtOr-0001nb-Iu for 68242@debbugs.gnu.org; Mon, 08 Jan 2024 12:26:58 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMtOb-0004ro-9e; Mon, 08 Jan 2024 12:26:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=hcClJ/wfjrpKvIJKEk3/LNrKJ5fm1eC4wli3fILYlfY=; b=YsJedJMcC24K5pz/xIfE vbFvj6U4xpz3fSF8SSeoavL7SzVPkSAwWKtbVDY2AjVDEw1/Yw7dliI1IbDE3qwqiezpJrHadB8C+ 0YuIXtcyZXH469MKksThmvdkG7Q3jX98RMRu7aIZE2Md1/X2H8BaYPapq17uFesIcal2FFOzv/AGQ 8/TD+3mgtlY6LNe41Ki4qNx927V2eh3Q1HAkdhdhXsRCxORfXIxQ3GxrrqmzQX+coO0+JIlOhWDd+ TdJguodfVgMQNAXrGajekREWtdH3KzG4lEQb5Ve2OH+PjlcS9QwSk7ajLOlrA+6ygKDxhPtVNfmMO 5xb6BnS94QVr5A==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <2d37c22fc834b1062c456c8b23974d9be5a2ff56.1704484373.git.maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Fri, 5 Jan 2024 14:52:50 -0500") References: <2d37c22fc834b1062c456c8b23974d9be5a2ff56.1704484373.git.maxim.cournoyer@gmail.com> Date: Mon, 08 Jan 2024 18:26:37 +0100 Message-ID: <87il433fea.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > There were sometimes out of memory errors on the Berlin build farm, especially > for i686 or arm machines having less memory. > > * guix/build/utils.scm (%xz-parallel-args): Reduce --memlimit value from 50% > to 20%. > > Change-Id: If848bed92ef4c42d11a96057e59ee51a019d0573 LGTM. From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [core-updates] Compress man pages using zstd Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 17:30:02 +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: Maxim Cournoyer Cc: 68242@debbugs.gnu.org Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.17047349937242 (code B ref 68242); Mon, 08 Jan 2024 17:30:02 +0000 Received: (at 68242) by debbugs.gnu.org; 8 Jan 2024 17:29:53 +0000 Received: from localhost ([127.0.0.1]:37491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtRh-0001sj-I8 for submit@debbugs.gnu.org; Mon, 08 Jan 2024 12:29:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtRf-0001sX-AL for 68242@debbugs.gnu.org; Mon, 08 Jan 2024 12:29:52 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMtRS-0006M0-La; Mon, 08 Jan 2024 12:29:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=XkcxLG3Lc2FhoyV3pgCjTU8IQfwfzjk+mRQOOnT1T2U=; b=pqXwviv8CcAhEDql7BhW tBBqBC9gnlbOFdO4wvdG3BoOFPNP66xW8gSAXgc/AvZ+Ex2+JkS9qcZ6YZe+3OXxkk+jJmzMlGhsm rSmvSNUUbQXmFP49unTTzOBJJOtiZ9MI/xyGcLBwtmYQqCAn9Zf/nMD42pNdCnzn4RPbtsywMrrct nqaR8xwrF7cRO4vlg5NXb49AFfooPIY31lPStknNiSODj8d4CbBySO/Y7cXDEKbpMBDiHyXeVePyb QIJsnI90L0xhymsNwGFr/KzjVZE2/sUMirg1oRBqzyZYT87l0IZuRkl4ouwOgu8tF0DAL1rmmvLpY C2eSoUQJlE8cSg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Maxim Cournoyer's message of "Fri, 5 Jan 2024 14:52:53 -0500") References: Date: Mon, 08 Jan 2024 18:29:18 +0100 Message-ID: <87eder3f9t.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > The aim is to improve the efficiency of computing the man pages database, > which must decompress the man pages. Zstd is faster than gzip, especiall= y for > decompression, and has a similar compression ratio. > > * gnu/packages/commencement.scm (%final-inputs): Add zstd. > * guix/build/gnu-build-system.scm > (compress-documentation) Update doc. > > : New arguments. > : Rename argument to... > : ... this. Add an 'extension' argument = to > the retarget-symlink nested procedure. Use new arguments in nested > 'maybe-compress' procedure. > > Change-Id: Ibaad4658f8e5151633714d263d9198f56d255020 That=E2=80=99s a great idea, LGTM! Do you have figures on the space savings of a package with many man pages such as gnutls:doc or openssl:doc? Thanks, Ludo=E2=80=99. From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [core-updates] Compress man pages using zstd Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 17:31:02 +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: Maxim Cournoyer Cc: Josselin Poiret , 68242@debbugs.gnu.org, Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Ricardo Wurmus , Christopher Baines Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.170473504813978 (code B ref 68242); Mon, 08 Jan 2024 17:31:02 +0000 Received: (at 68242) by debbugs.gnu.org; 8 Jan 2024 17:30:48 +0000 Received: from localhost ([127.0.0.1]:37496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtSZ-0003cn-UZ for submit@debbugs.gnu.org; Mon, 08 Jan 2024 12:30:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMtSX-0003Pp-Ni for 68242@debbugs.gnu.org; Mon, 08 Jan 2024 12:30:46 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMtSL-00070B-RZ; Mon, 08 Jan 2024 12:30:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=5SMIgffo62hIUMUzJSI05Hpiv+Fcu14RCIMeeXWhwlY=; b=evf0wXVcP0W7K9lEfeWd DacqUE3N6yE+ktFh3lHOSMupfDEWByCwPEZHTkPZquTI5sFdFE8wl5fmgTydc6TaZAnikPXN0xrwR GVTDXG5HUpZkPLAba74j0RmvPkbm/kkXwxqd6dAij8RzJc4nLs71VGTVhZwGfe6y7edEmaSp1ve8y GCFbtYJpi2Bte10gpvhUn1N1nawQ56PRTMmjuObEzfHIt4xh2OqRr32DcI5lWtLGE5pxEg/5oLkfL jv9RrMrsk8wZDRFH/a/meKX4+smpNqna+aoDj44OmfZ2jO91mCsIXLmUEuZnuUl9QNykUh7h3utfs ZMC0la9hzoYTMg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Maxim Cournoyer's message of "Fri, 5 Jan 2024 14:52:54 -0500") References: Date: Mon, 08 Jan 2024 18:30:28 +0100 Message-ID: <87a5pf3f7v.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > * guix/man-db.scm (): Adjust comment. > (abbreviate-file-name): Adjust regexp. > (gz-compressed?, zstd-compressed?): New predicates. > (entry->string): Use them. > (man-page->entry): Adjust doc. Use input port reader appropriate to the > compression type, if any. > (man-files): Adjust regexp. > (mandb-entries): Adjust link resolving predicate. > * guix/profiles.scm (manual-database): Add guile-zlib extension. > > Change-Id: I6336e46e2d324c520a7d15d6cafd12bbf43c5b09 [...] > (define-module (guix man-db) > #:use-module (zlib) > + #:use-module (zstd) Maybe #:autoload both modules for good measure. Otherwise LGTM, thanks! Ludo=E2=80=99. From unknown Sun Jul 20 14:10:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68242] [core-updates] Compress man pages using zstd Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 01:19:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 68242@debbugs.gnu.org Received: via spool by 68242-submit@debbugs.gnu.org id=B68242.170476309117614 (code B ref 68242); Tue, 09 Jan 2024 01:19:01 +0000 Received: (at 68242) by debbugs.gnu.org; 9 Jan 2024 01:18:11 +0000 Received: from localhost ([127.0.0.1]:37945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rN0ks-0004a1-Ag for submit@debbugs.gnu.org; Mon, 08 Jan 2024 20:18:10 -0500 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]:54423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rN0kn-0004ZR-Q6 for 68242@debbugs.gnu.org; Mon, 08 Jan 2024 20:18:08 -0500 Received: by mail-qv1-xf36.google.com with SMTP id 6a1803df08f44-67f7bd86cafso20637606d6.0 for <68242@debbugs.gnu.org>; Mon, 08 Jan 2024 17:17:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704763073; x=1705367873; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TsTZ4dfo4emd7Qqim37eEKux/muCb2eYzblD8HCvAA4=; b=IdNWarzA/cIDLI+uLVl834d+WNW2klpPTSiJN0oZS2FMe8+kqe6+tz/QQ+c8wVJhl8 Q+n7BculTj8EMs+mjEu+yFpyIM10d+yLnP2LelRGgARwndMRRN6r3EtV8NHiORQaC3pb Bzt5UFMlBwz8XVIDv0n7u5qk+q60SQBDjtfBNovH088reFmTiNLA7edAh4Uc1OS7L0Fo TqXNVkOF/89DdRi8d/b8z+++JJIxou7W9VW/0N3dz5pktlOqPV2q1LaClAoJfjduZyaa sERAQXmaUBIXXbh7SYyYq+LQx27MJfzm/jcE+AZG3YfhwWwXM9CPgyU1ZcjAlaOOWQVu 6+2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704763073; x=1705367873; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TsTZ4dfo4emd7Qqim37eEKux/muCb2eYzblD8HCvAA4=; b=wsF/rsTuhLO6GfhdfEgo+iU3ZWoPHVhonmneWzwr1NjCbneEaUYX0keTN8xpFE2BOp TdQ6racgneOGX6WiUWKvlgyy+JYidk7p0we9X/aEh9dL+UQ52ddSDax4qghhRE5VYbBQ dgQzdlqdEr3pR19I6U9QMDT/aQY79S9CYTMzfwCdkmp5j7/jdBR1QdotW9I9kxMbWBXR /ogeBZ1DYIaX53KNPjJb5f+PO/cEWU3vn6zT0TkoeNq+uuUlwQS1jSeEREOLy9HnJU6J Nmg5Pwuc8nkrsipzqj0Dx36nJDwfQd10RZF4iq6k5zsEqu/ajWl8fsmIpUGgOtfXAoWd yBXw== X-Gm-Message-State: AOJu0Yw0fiCbFTKD7AyVjgCCABF8TucU/zrcRN//xvnmM7YK/JB/D/8H RFgJVcC1sdBxVIe/RI4PAqtHMRIG3Jo= X-Google-Smtp-Source: AGHT+IHqmy+36g0qoy8K/BFpuOYCMc9SOfA2of7vLtDy4TUKnQqR4EKq2nuEKOCZV2zSS5xTlzT7+A== X-Received: by 2002:a05:6214:1c4e:b0:680:d233:9d7 with SMTP id if14-20020a0562141c4e00b00680d23309d7mr6609905qvb.125.1704763073119; Mon, 08 Jan 2024 17:17:53 -0800 (PST) Received: from hurd (dsl-205-151-56-231.b2b2c.ca. [205.151.56.231]) by smtp.gmail.com with ESMTPSA id fe5-20020a0562140b8500b0067f90426698sm461339qvb.23.2024.01.08.17.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 17:17:52 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <87eder3f9t.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Mon, 08 Jan 2024 18:29:18 +0100") References: <87eder3f9t.fsf_-_@gnu.org> Date: Mon, 08 Jan 2024 20:17:51 -0500 Message-ID: <87h6jnxq2o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic! Ludovic Court=C3=A8s writes: > Maxim Cournoyer skribis: > >> The aim is to improve the efficiency of computing the man pages database, >> which must decompress the man pages. Zstd is faster than gzip, especial= ly for >> decompression, and has a similar compression ratio. >> >> * gnu/packages/commencement.scm (%final-inputs): Add zstd. >> * guix/build/gnu-build-system.scm >> (compress-documentation) Update doc. >> >> : New arguments. >> : Rename argument to... >> : ... this. Add an 'extension' argument= to >> the retarget-symlink nested procedure. Use new arguments in nested >> 'maybe-compress' procedure. >> >> Change-Id: Ibaad4658f8e5151633714d263d9198f56d255020 > > That=E2=80=99s a great idea, LGTM! Thank you for the review! > Do you have figures on the space savings of a package with many man > pages such as gnutls:doc or openssl:doc? Surprisingly, all of these I've checked used the weighed the same. Here's gnutls:doc from my local (master) Guix: --8<---------------cut here---------------start------------->8--- $ du -sh /gnu/store/8i3bas6lhziqi2n5wg6qzzhlddkb502c-gnutls-3.7.7-doc 4,9M /gnu/store/8i3bas6lhziqi2n5wg6qzzhlddkb502c-gnutls-3.7.7-doc --8<---------------cut here---------------end--------------->8--- Compared to core-updates with these changes: --8<---------------cut here---------------start------------->8--- $ du -sh /gnu/store/h3lbj1g64lkn9rd9xp86dphqnblxqkl6-gnutls-3.8.1-doc 4.9M /gnu/store/h3lbj1g64lkn9rd9xp86dphqnblxqkl6-gnutls-3.8.1-doc --8<---------------cut here---------------end--------------->8--- That's because all the compressed man pages appear to fit in the minimal 4 KiB size of a single file, whether they are compressed with gzip or zstd compressed. Both man-pages packages weigh 11 MiB, but we can get an idea of the compression ratio using: With my local Guix: --8<---------------cut here---------------start------------->8--- $ find $(guix build man-pages) -name '*.gz' | xargs -n1 du | sort -rn | hea= d -n20 64 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man5/proc.5.gz 44 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/bpf-helpers.7.gz 32 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/perf_event_open.2.gz 28 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/ptrace.2.gz 20 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/tcp.7.gz 20 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/cgroups.7.gz 20 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/seccomp_unotify.2.gz 20 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/prctl.2.gz 20 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/open.2.gz 20 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/futex.2.gz 20 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/fcntl.2.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/user_namespaces.7.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/socket.7.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/man-pages.7.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/ip.7.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/cpuset.7.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man7/capabilities.7.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man5/elf.5.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/seccomp.2.gz 16 /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02/share/ma= n/man2/keyctl.2.gz --8<---------------cut here---------------end--------------->8--- On core-updates with these changes: --8<---------------cut here---------------start------------->8--- $ find /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02 -name '*.= zst' | xargs -n1 du | sort -rn | head -n20 56 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man5/proc.5.zst 36 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/bpf-helpers.7.zst 28 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/perf_event_open.2.zst 24 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/ptrace.2.zst 20 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/tcp.7.zst 20 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/seccomp_unotify.2.zst 20 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/prctl.2.zst 20 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/futex.2.zst 20 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/fcntl.2.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/user_namespaces.7.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/man-pages.7.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/ip.7.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/cpuset.7.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/cgroups.7.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man7/capabilities.7.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man5/elf.5.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/seccomp.2.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/open.2.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/keyctl.2.zst 16 /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02/share/ma= n/man2/clone.2.zst --8<---------------cut here---------------end--------------->8--- So for larger man pages, it seems we're talking about a 10% improvement. That's not much, but the decompression is more efficient: Compare gzipped man-pages decompression: --8<---------------cut here---------------start------------->8--- $ find /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02 -name '*.= gz' | sh -c 'time xargs gunzip -ck > /dev/null' real 0m0.137s user 0m0.106s sys 0m0.032s $ find /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02 -name '*.= gz' | sh -c 'time xargs gunzip -ck > /dev/null' real 0m0.137s user 0m0.104s sys 0m0.035s $ find /gnu/store/93fjc9hv5canvs2lpya0qsbcm44hq7hh-man-pages-6.02 -name '*.= gz' | sh -c 'time xargs gunzip -ck > /dev/null' real 0m0.138s user 0m0.103s sys 0m0.036s --8<---------------cut here---------------end--------------->8--- With zstd' man-pages decompression: --8<---------------cut here---------------start------------->8--- $ find /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02 -name '*.= zst' | sh -c 'time xargs zstd -dkc > /dev/null' real 0m0.091s user 0m0.033s sys 0m0.059s $ find /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02 -name '*.= zst' | sh -c 'time xargs zstd -dkc > /dev/null' real 0m0.091s user 0m0.035s sys 0m0.058s $ find /gnu/store/nqp5mmi1kb4xp7nkqsybrp5i18lygsl2-man-pages-6.02 -name '*.= zst' | sh -c 'time xargs zstd -dkc > /dev/null' real 0m0.090s user 0m0.027s sys 0m0.063s --8<---------------cut here---------------end--------------->8--- Assuming guile-zstd fares as well as zstd itself, we're looking at 1.5x faster decompression. Past measurements though had suggested the decompression was not the limiting thing in making man-pages faster; rather it had to do with building the database with Guile (sorry, I can't find a reference to it anymore). --=20 Thanks, Maxim From unknown Sun Jul 20 14:10:11 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Maxim Cournoyer Subject: bug#68242: closed (Re: bug#68242: [core-updates] Compress man pages using zstd) Message-ID: References: <87a5pfxjv9.fsf@gmail.com> X-Gnu-PR-Message: they-closed 68242 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 68242@debbugs.gnu.org Date: Tue, 09 Jan 2024 03:33:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1704771182-24443-1" This is a multi-part message in MIME format... ------------=_1704771182-24443-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #68242: [core-updates] Compress man pages using zstd which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 68242@debbugs.gnu.org. --=20 68242: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68242 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1704771182-24443-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 68242-done) by debbugs.gnu.org; 9 Jan 2024 03:32:11 +0000 Received: from localhost ([127.0.0.1]:37986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rN2qZ-0006Kv-4B for submit@debbugs.gnu.org; Mon, 08 Jan 2024 22:32:11 -0500 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:59404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rN2qX-0006Kg-1I for 68242-done@debbugs.gnu.org; Mon, 08 Jan 2024 22:32:10 -0500 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-67f7da00237so10213836d6.2 for <68242-done@debbugs.gnu.org>; Mon, 08 Jan 2024 19:32:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704771117; x=1705375917; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UdSmtywTu9TWrR7qnFesd5DWvh36BTLUjdEHyRlopEM=; b=jrj93o2tjkZvb2TJ5pn3fnQzO65urg1FJ9SCKIJ8OG+YE6PNq2z7CRZ97oyvn1F7gb 9luMSkqZPRsPs823wBNJOHXT4OEpa3H7CpCBpVnLyDQL/tZrVFn+EPAvmHSeRH74T2fW tBnRjEAPHUIWF7LxNR3hYYxqRpxq3nxN4nv5KR/uVbskkT6JuQc3EiCnz+LWnAD+1Hqf 52cwM5kXnO2AX5oLPpRn+tnRnz1Iy8K1lLKq69cADrzF5Rh/cxDCY7w6ae142hiYGFC/ yAL/tYLasnvmoO7ZkNez6VVLx5gcqfPXRw/Gu1yA+3RAPV3qDrUcHc/uvEQ+trQ2yOfi 4kAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704771117; x=1705375917; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UdSmtywTu9TWrR7qnFesd5DWvh36BTLUjdEHyRlopEM=; b=uMMl6clDOjMKYnO2IN0ZkxC0qOZxKXR7zTJdZyQReto3FXSsjiqoGBUHsvHskdkpEl GJ7J/UQaa1LDHGP8td84L8i0mDWyfYKSNAukVMxv6IYnruH2EmS7KX3iDg1iReM1t/2u OwiduZZk+OXjcgIzJADgBiLOZHaiq1uQ+y7CMP8TwwhUMzz6dgBBqLb5gDcgB03Ah0MT p0o/orgKNvtR0pNrOQFoKHk3+qVN8s0rY2PtmeratYzzFxd9881Y505Sad1nv8Pw4CtR peuoTLOf8/4xixs03AqMV0NCde7HzDCrAoAhR5rgUv14nKZuZr4phcgdnAcvML34GURi wC8A== X-Gm-Message-State: AOJu0YzwMGuBwtV6YSoBJ+Tk8Pms2zfCA22Jq1CDrXDj7W/xPlZnMAhV 6iCBHX/zFtEUEnJCO0TKjT0= X-Google-Smtp-Source: AGHT+IHVHzO0BbN/dwhD62KHYBNwQzJP64QCgWyv2JuXtGbtMnyGPqCj11NJD9COq2rV8dJgxNEXkg== X-Received: by 2002:a05:6214:5281:b0:681:9da:db0a with SMTP id kj1-20020a056214528100b0068109dadb0amr1759752qvb.76.1704771116759; Mon, 08 Jan 2024 19:31:56 -0800 (PST) Received: from hurd (dsl-205-151-56-231.b2b2c.ca. [205.151.56.231]) by smtp.gmail.com with ESMTPSA id pp22-20020a056214139600b0067f0d8cf418sm537812qvb.70.2024.01.08.19.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 19:31:56 -0800 (PST) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#68242: [core-updates] Compress man pages using zstd In-Reply-To: <87a5pf3f7v.fsf_-_@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s?= =?utf-8?Q?=22's?= message of "Mon, 08 Jan 2024 18:30:28 +0100") References: <87a5pf3f7v.fsf_-_@gnu.org> Date: Mon, 08 Jan 2024 22:31:54 -0500 Message-ID: <87a5pfxjv9.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68242-done Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , 68242-done@debbugs.gnu.org, Ricardo Wurmus , Christopher Baines X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Ludovic Court=C3=A8s writes: > Maxim Cournoyer skribis: > >> * guix/man-db.scm (): Adjust comment. >> (abbreviate-file-name): Adjust regexp. >> (gz-compressed?, zstd-compressed?): New predicates. >> (entry->string): Use them. >> (man-page->entry): Adjust doc. Use input port reader appropriate to the >> compression type, if any. >> (man-files): Adjust regexp. >> (mandb-entries): Adjust link resolving predicate. >> * guix/profiles.scm (manual-database): Add guile-zlib extension. >> >> Change-Id: I6336e46e2d324c520a7d15d6cafd12bbf43c5b09 > > [...] > >> (define-module (guix man-db) >> #:use-module (zlib) >> + #:use-module (zstd) > > Maybe #:autoload both modules for good measure. Done. > Otherwise LGTM, thanks! Excellent, I've pushed the series. Closing! --=20 Thanks, Maxim ------------=_1704771182-24443-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Jan 2024 15:17:09 +0000 Received: from localhost ([127.0.0.1]:55462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLPT3-000404-As for submit@debbugs.gnu.org; Thu, 04 Jan 2024 10:17:09 -0500 Received: from lists.gnu.org ([2001:470:142::17]:48138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLPSz-0003zT-OH for submit@debbugs.gnu.org; Thu, 04 Jan 2024 10:17: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 1rLPSq-0003Ik-DN for guix-patches@gnu.org; Thu, 04 Jan 2024 10:16:56 -0500 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLPSo-0003A6-26 for guix-patches@gnu.org; Thu, 04 Jan 2024 10:16:56 -0500 Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-42836658198so2854691cf.0 for ; Thu, 04 Jan 2024 07:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704381413; x=1704986213; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RQQSuWf5Qc4RndWb5qHMme5GD0PZpRl9BOJnLrqWKIQ=; b=HY0ePVBNstAcgcUTsKI3UtW7AEzaJsUVpQUmBAsxLS9QrrrQokmjd2QpXpSR+Hm58R INIDtBWyh5E4FjsqgcM8JTnWn6QclXimJ/gnc6rv0BuOW03mNolz234v9toHRwmERGkA U5VB1agMr1AH2edl6CkeUi70FwrOCifkE1bgP3O4jgT2MIxELBfeKqbewQaaOo7OdS0h fhS6EkucuqReGFIWURfkfRMzichWwKg29TFzgIwL0hV5LJDvpqp1V8iuakNTICqQF7hp jhPdKxwa3ZnXOeh/JtCfU3HXyrSECXbMt8WV8p13O5jWzTXUHFv8iWehOc+lF69b+trD yeBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381413; x=1704986213; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RQQSuWf5Qc4RndWb5qHMme5GD0PZpRl9BOJnLrqWKIQ=; b=FywsRD8x8an0+hXoOkTKpTEUxuf0s2B6jcgvZOKp3UNeWGp87f8nCAB1RSHJ+nrajE zyGYugkUteXlEUr5bWJ89CxkV0dQkqDWgVCfwVgm3C+MYP0yWzLexQB0NpxKEfGazP/Q q66G6k1sbUbygcF3EVWz9FlM4go8NVHtZqbNDjkjSBL1zgXhHOBj+BI2PnkRKIMuPGgF TizfgJMVeyWCj3NpathVh9VU+2f5tzwyk9qup0uZMPqjUPkUX2lQpP8KYx5JCEp6n+3G SKPc1hHGU7LJRMKJgOmc6ceRnNetNxIQbxw4j7P9ZmWHA9SMdWtXrlnMz9KddrBtvQCE M7Ng== X-Gm-Message-State: AOJu0Yxmu1doW6MeeA+xGHxvCJu6VWj+kUHCiYO+54aplVdP75ImbH3y g/XVIBqqY+qnOw+b6OpMKWJetWUF5ac+fg== X-Google-Smtp-Source: AGHT+IEEfa5WoAoUvtWVombvNtrGs4JwDE1G4MfZaUl2kCUSdNt3VNqW6UBnOD0MwfB6/R/kYAGaXA== X-Received: by 2002:a05:622a:34b:b0:428:3c5f:8e9c with SMTP id r11-20020a05622a034b00b004283c5f8e9cmr749497qtw.37.1704381412695; Thu, 04 Jan 2024 07:16:52 -0800 (PST) Received: from localhost.localdomain (dsl-10-135-125.b2b2c.ca. [72.10.135.125]) by smtp.gmail.com with ESMTPSA id x7-20020ac84a07000000b00423e9316931sm15280968qtq.83.2024.01.04.07.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:16:52 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/5] Compress man pages using zstd Date: Thu, 4 Jan 2024 10:16:41 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::82e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82e.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This series changes the compressor of our man pages from gzip to zstd, which decompresses much faster, and compresses better at the chosen level (19). Maxim Cournoyer (5): utils: Lower xz compression memory usage limit to 20%. compression: Enable zstd parallel compression. packages: Repack patched source archives via zstd by default. build: gnu-build-system: Compress man pages with zstd. man-db: Add support for zstd compressed man pages. gnu/compression.scm | 3 +- gnu/packages/commencement.scm | 3 +- guix/build/gnu-build-system.scm | 71 +++++++++++++++++++++------------ guix/build/utils.scm | 3 +- guix/man-db.scm | 45 ++++++++++++++++----- guix/packages.scm | 51 +++++++++++++---------- guix/profiles.scm | 8 +++- 7 files changed, 122 insertions(+), 62 deletions(-) base-commit: 784a7e8da6456e6388e2bfc213e93e252eb2be40 -- 2.41.0 ------------=_1704771182-24443-1--