Received: (at 68420) by debbugs.gnu.org; 13 Jan 2024 09:36:55 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jan 13 04:36:55 2024 Received: from localhost ([127.0.0.1]:38443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rOaRj-00089O-83 for submit <at> debbugs.gnu.org; Sat, 13 Jan 2024 04:36:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <othacehe@HIDDEN>) id 1rOaRh-00088z-7r for 68420 <at> debbugs.gnu.org; Sat, 13 Jan 2024 04:36:53 -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 <othacehe@HIDDEN>) id 1rOaRa-0007QC-4e; Sat, 13 Jan 2024 04:36:46 -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=TqFkq4CLEW3JGhdVZJM/qE0whlU5IrDe+5W/6+aMEVo=; b=U1HVxNSi7i7+pYdrz/BR TiGNaT9MxzNd/I0z4vO1nzNMayaouj6N0aVNw0KGMmDzcvhQA+T+GWMFNKD+Uv5bNC9/yJVRSAuiU mQNSC5bgzIlw9XtmjOSoSJO/O/TBYx2JCZJ3DbdbzRP06Ou4pucy5qCNpVpTOTydqrvqmVI3XHUX1 Yk3g8cvkd60IklIe7+EoJuF0+NDSKQ2BE4KEW6i6Yjoo6GFLck93d9S9y1t+FPNqMBXP/1lFSu3ua azIfCyx2IgbaG6qVz1CqLmBP/aayiKw3ll0yrOnS1XEQrqZNiZlGKjltrOl3pmwMadyZr8v1wEJ7k 9yqL0PN//u0kWQ==; From: Mathieu Othacehe <othacehe@HIDDEN> To: Hilton Chain <hako@HIDDEN> Subject: Re: [bug#68420] [PATCH 1/1] scripts: size: Add =?utf-8?B?4oCYc3lz?= =?utf-8?B?dGVt4oCZ?= argument to =?utf-8?Q?=E2=80=98ensure-store-item=E2=80=99=2E?= In-Reply-To: <bb8fa8defba6b656280a2f59f5291789965fbd0f.1705127855.git.hako@HIDDEN> (Hilton Chain's message of "Sat, 13 Jan 2024 15:29:33 +0800") References: <cover.1705127855.git.hako@HIDDEN> <bb8fa8defba6b656280a2f59f5291789965fbd0f.1705127855.git.hako@HIDDEN> Date: Sat, 13 Jan 2024 10:36:37 +0100 Message-ID: <8734v1inh6.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68420 Cc: Josselin Poiret <dev@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, 68420 <at> debbugs.gnu.org, Zheng Junjie <zhengjunjie@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Christopher Baines <guix@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hey, > -(define* (ensure-store-item spec-or-item) When I have a look to the derivation that is computed in that procedure, it looks like it has the expected system (the one passed as a cli argument). Do you have any evidence of `guix size` doing the wrong thing after c245a54aab? Thanks, Mathieu
guix-patches@HIDDEN
:bug#68420
; Package guix-patches
.
Full text available.Received: (at 68420) by debbugs.gnu.org; 13 Jan 2024 07:29:50 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jan 13 02:29:50 2024 Received: from localhost ([127.0.0.1]:38291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rOYSj-0005vM-Ln for submit <at> debbugs.gnu.org; Sat, 13 Jan 2024 02:29:50 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:37014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1rOYSh-0005vD-Q5 for 68420 <at> debbugs.gnu.org; Sat, 13 Jan 2024 02:29:48 -0500 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1705130976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZH0vL1/d5hAuxBGC+i7JzgNpWOPhMozPvvwiyJlQjTg=; b=3qBnTr/wKvVepP3GipERv1oKQyhTqVPum4o9SFpyxFojfYufpnY+jJo0CAIFz6/tPZLAWI m//zZedcILyZ8LutqOjgtn9pFL7SEkXZCvSJ9PlQYg07pXhbyrurLnOvy8D2AHgq9xSqhk PHqhjjiADE9R9Op04lrNfUKlGO2ZTFKDzYNitMTwnS25/1hxjTH6K03OqwJOGyRAQ1rNzH dW/lihRWCcZco2aGNaPSmqlr8N2gEdwAKRe4h02gnold4i6OlaCLvtrnfY64gJ5/9Oig6s 1+j7zI0B4OHdsyKGXCG+PdbFhicQ2XrGglU5KuhXBLR3+6g25k1rBSYKY+sy9Q== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN To: 68420 <at> debbugs.gnu.org Subject: [PATCH 1/1] scripts: size: Add ‘system’ argument to ‘ensure-store-item’. Date: Sat, 13 Jan 2024 15:29:33 +0800 Message-ID: <bb8fa8defba6b656280a2f59f5291789965fbd0f.1705127855.git.hako@HIDDEN> In-Reply-To: <cover.1705127855.git.hako@HIDDEN> References: <cover.1705127855.git.hako@HIDDEN> X-Debbugs-Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, Zheng Junjie <zhengjunjie@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68420 Cc: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) This is a follow-up to c245a54aab348642178129a9aad501b81a3089b4. ‘%current-system’ is already parameterized within ‘run-with-store’, the root cause is that ‘mlet*’ bindings are evaluated before the parameterization. * guix/scripts/size.scm (ensure-store-item): Add ‘system’ argument and pass it to ‘package->derivation’. (guix-size): Adjust accordingly. Change-Id: I910af7c137737bcd0ee079e57a81c4114ab5ae32 --- guix/scripts/size.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index 8a8676a16f..0603c0498a 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -168,7 +168,7 @@ (define (store-profile items) (return (profile item size dependencies))))) sizes))) -(define* (ensure-store-item spec-or-item) +(define* (ensure-store-item spec-or-item #:optional (system (%current-system))) "Return a store file name. If SPEC-OR-ITEM is a store file name, return it as is. Otherwise, assume SPEC-OR-ITEM is a package output specification such as \"guile:debug\" or \"gcc-4.8\" and return its store file name." @@ -177,7 +177,7 @@ (define* (ensure-store-item spec-or-item) (return spec-or-item) (let-values (((package output) (specification->package+output spec-or-item))) - (mlet %store-monad ((drv (package->derivation package))) + (mlet %store-monad ((drv (package->derivation package system))) ;; Note: we don't try building DRV like 'guix archive' does ;; because we don't have to since we can instead rely on ;; substitute meta-data. @@ -317,8 +317,7 @@ (define-command (guix-size . args) ;; Turn off grafts because (1) substitute servers do not serve grafted ;; packages, and (2) they do not make any difference on the ;; resulting size. - (parameterize ((%graft? #f) - (%current-system system)) + (parameterize ((%graft? #f)) (with-store store (set-build-options store #:use-substitutes? #t @@ -326,7 +325,9 @@ (define-command (guix-size . args) (run-with-store store (mlet* %store-monad ((items (mapm %store-monad - ensure-store-item files)) + (cut ensure-store-item <> + system) + files)) (profile (store-profile items))) (if map-file (begin -- 2.41.0
guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, zhengjunjie@HIDDEN, guix-patches@HIDDEN
:bug#68420
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 13 Jan 2024 07:25:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jan 13 02:25:50 2024 Received: from localhost ([127.0.0.1]:38274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rOYOs-0005ow-Iq for submit <at> debbugs.gnu.org; Sat, 13 Jan 2024 02:25:50 -0500 Received: from lists.gnu.org ([2001:470:142::17]:36926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1rOYOp-0005og-Py for submit <at> debbugs.gnu.org; Sat, 13 Jan 2024 02:25:48 -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 <hako@HIDDEN>) id 1rOYOl-0001Cv-Hi for guix-patches@HIDDEN; Sat, 13 Jan 2024 02:25:43 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <hako@HIDDEN>) id 1rOYOj-0007iS-H6 for guix-patches@HIDDEN; Sat, 13 Jan 2024 02:25:43 -0500 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1705130727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RuiIN3BqUZt18NrZe69sIPrHInXk/b/V4PBWkhSwDo0=; b=YFxLVHApfn+EmrtSz6DiVOdxG56QFIl9sRAFcwEIOU6jx87Zgx0ePKiL06I/aAhuywYoru A5VZnR3ar5qLhBpuWOcBwxy8woqxw8Gw9DH597JP6hqQBCFi0LTrY6AwvOKux73gQ549Zg ZArfBR6UO6bY4rgE2colrw2BKG4xyJKZC7n2purt+O3Y/Y+Qe/RmiY4PklBgE/kisWFUTK 85Vtm7ugCrAEDY1d2fr7tD9oFK8KkJ4DVcaUL83CUNfUQz1UZyeNK0WeLOcE4JzT3oAak1 CL5l13RWtIAibxOQtHoEYn4BY+xmknwjB28je/QhG7Op35Duo1foUGGPk82adQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN To: guix-patches@HIDDEN Subject: [PATCH 0/1] scripts: size: Add ‘system’ argument to ‘ensure-store-item’. Date: Sat, 13 Jan 2024 15:25:17 +0800 Message-ID: <cover.1705127855.git.hako@HIDDEN> X-Debbugs-Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, Zheng Junjie <zhengjunjie@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + X-Spam-Level: * Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@HIDDEN; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) This patch is a follow-up to <https://issues.guix.gnu.org/68363>. Since the issue hasn't been found for a long time, I think it's better to pass the system explicitly. Thanks Hilton Chain (1): scripts: size: Add ‘system’ argument to ‘ensure-store-item’. guix/scripts/size.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) base-commit: c0b303aaa3d6154acbe054120d11467eb98e6d33 -- 2.41.0
Hilton Chain <hako@HIDDEN>
:guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, zhengjunjie@HIDDEN, guix-patches@HIDDEN
.
Full text available.guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, zhengjunjie@HIDDEN, guix-patches@HIDDEN
:bug#68420
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.