From patchwork Sun Dec 31 06:06:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: antlers X-Patchwork-Id: 58232 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8489B27BBEA; Sun, 31 Dec 2023 06:25:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A8C7627BBE2 for ; Sun, 31 Dec 2023 06:25:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJpG3-0003U3-PY; Sun, 31 Dec 2023 01:25:11 -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 1rJpG0-0003Tg-2A for guix-patches@gnu.org; Sun, 31 Dec 2023 01:25:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJpFz-0001xC-14; Sun, 31 Dec 2023 01:25:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJpFu-0007aN-Ed; Sun, 31 Dec 2023 01:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68163] [PATCH] gnu: Prevent stale cache use when `%package-module-path' is parameterized. Resent-From: antlers 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: Sun, 31 Dec 2023 06:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68163 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68163@debbugs.gnu.org Cc: antlers , guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr Received: via spool by submit@debbugs.gnu.org id=B.170400389529133 (code B ref -1); Sun, 31 Dec 2023 06:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2023 06:24:55 +0000 Received: from localhost ([127.0.0.1]:45502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJpFm-0007Zp-Ib for submit@debbugs.gnu.org; Sun, 31 Dec 2023 01:24:54 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJpFh-0007ZU-Oe for submit@debbugs.gnu.org; Sun, 31 Dec 2023 01:24:53 -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 1rJpFb-0003Sx-7F for guix-patches@gnu.org; Sun, 31 Dec 2023 01:24:43 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJpFZ-0001i5-8L for guix-patches@gnu.org; Sun, 31 Dec 2023 01:24:42 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id CD5853200C3D; Sun, 31 Dec 2023 01:24:36 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 31 Dec 2023 01:24:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=illucid.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm1; t=1704003876; x=1704090276; bh=BITDvyJOi55QFAmQC+Fjj U7ez8cei8GJIaMXWBec/Lk=; b=w9e/6iYaYGKnrTns1eQPfR+8wLbPyuMJA2L0n IMj4+PlAJBN7d8Ze6LityCmGaM0qxSj5QumiqyfqNw0JBnyrU2kwsIF8aW5osyuC aL2SB90fkPH61vrF2tIvzlQgfLR5lHEzpdDIkB+lkfJUiwH7TYWfhiVw0xGytqlU EZvtl4hC08Je6xVHOeOng80D60jW/m6z6nhJOUXb8/BXsB8UYud11kEbl/Kwf1xT TB4eNZ3Fl4mXMUPNiitm3feYOuSxMdE9nIYn1GVEsVHAjdCwSupEoUZ2SHR/DH/5 GsrvQEc2KTKGy2S+2KFCvcDy5J5pE47cSnCCb278bT2AooZow== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1704003876; x=1704090276; bh=BITDvyJOi55QFAmQC+FjjU7ez8ce i8GJIaMXWBec/Lk=; b=FmaQfJTCnW2zhoMEYELX/zqylqpVGKE5riYo0P13XXu3 /HhCQZ4k/SU/7kX9md75cqDbraPCjSoT1sZRJAgPDAFsLv3CZiKVjHtH57CD84IM 5ApxZ+8OXevOo1HB8serGDjlxtqpNbos+PEXr4hL06A2wC1fmf0YyHfaQ4OXGJdx C4Ugzw6BH2wtiJZ5t/T+G1JVVg8MkrvXXLO2m675My+5RU0NfHp2HbEkVFCN+TyP lvtbxfQtITSbiXNctsQQcrPBu3Gms87hjIo5z1gsF3IeLwC6kh1E4U8sH49NqCB+ Wjiz5Syj9oQSVQNxFy2U6zhpIm5Rjq6ywqpn+9kcKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdefiedgleehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpegrnhhtlhgvrhhsuceorghnthhlvghrshesihhllhhutghiugdr nhgvtheqnecuggftrfgrthhtvghrnhephfefkedthfegjedugefggfdvgeegueeilefhgf elgffhvedulefghfekteevgfejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomheprghnthhlvghrshesihhllhhutghiugdrnhgvth X-ME-Proxy: Feedback-ID: ie5814659:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Dec 2023 01:24:35 -0500 (EST) Date: Sun, 31 Dec 2023 06:06:21 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.24; envelope-from=antlers@illucid.net; helo=wout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: antlers X-ACL-Warn: , antlers via Guix-patches X-Patchwork-Original-From: antlers via Guix-patches via From: antlers Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages.scm(find-package-by-name/direct): Convert `delay'-ed cache construction in closure into a form memoized over `%package-module-path'. Change-Id: I6e4b4b3fa58082b79aacf307468aec43ec60bf22 --- This enables `specification->package' to be parameterized to resolve packages from within the module-under-compilation. I use this to parse my init.el[0] into packages in my guix-home profile, all in one repo. gnu/packages.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) base-commit: 2a242e86379ebddbdddf2927f26e5e27a98fc605 diff --git a/gnu/packages.scm b/gnu/packages.scm index 80c22d1d7f..b0cc2f7427 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -281,18 +281,21 @@ (define load-package-cache #f (apply throw args)))))))) -(define find-packages-by-name/direct ;bypass the cache - (let ((packages (delay - (fold-packages (lambda (p r) - (vhash-cons (package-name p) p r)) - vlist-null))) +(define find-packages-by-name/direct + ;; Bypass pre-built cache, but still memoize over `(%package-module-path)' + (let ((packages (lambda () + ((mlambda (_%package-module-path) + (fold-packages (lambda (p r) + (vhash-cons (package-name p) p r)) + vlist-null)) + (%package-module-path)))) (version>? (lambda (p1 p2) (version>? (package-version p1) (package-version p2))))) (lambda* (name #:optional version) "Return the list of packages with the given NAME. If VERSION is not #f, then only return packages whose version is prefixed by VERSION, sorted in decreasing version order." - (let ((matching (sort (vhash-fold* cons '() name (force packages)) + (let ((matching (sort (vhash-fold* cons '() name (packages)) version>?))) (if version (filter (lambda (package)