From patchwork Sat Apr 24 05:45:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 28842 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 7C20B27BC7D; Sat, 24 Apr 2021 06:46:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5083027BC7C for ; Sat, 24 Apr 2021 06:46:09 +0100 (BST) Received: from localhost ([::1]:35560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laB7I-0004M0-Id for patchwork@mira.cbaines.net; Sat, 24 Apr 2021 01:46:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laB7C-0004Lf-GM for guix-patches@gnu.org; Sat, 24 Apr 2021 01:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laB7C-0007nR-8x for guix-patches@gnu.org; Sat, 24 Apr 2021 01:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1laB7C-00043S-6A for guix-patches@gnu.org; Sat, 24 Apr 2021 01:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47986] [PATCH] inferior: Support querying package replacements. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Apr 2021 05:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47986@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161924311715530 (code B ref -1); Sat, 24 Apr 2021 05:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Apr 2021 05:45:17 +0000 Received: from localhost ([127.0.0.1]:39304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laB6T-00042P-2e for submit@debbugs.gnu.org; Sat, 24 Apr 2021 01:45:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:37120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laB6S-00042I-2R for submit@debbugs.gnu.org; Sat, 24 Apr 2021 01:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laB6R-0004Cy-Jb for guix-patches@gnu.org; Sat, 24 Apr 2021 01:45:15 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:52855) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laB6P-00077M-Kl for guix-patches@gnu.org; Sat, 24 Apr 2021 01:45:15 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id BD1D927BC7C for ; Sat, 24 Apr 2021 06:45:09 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 338d572e for ; Sat, 24 Apr 2021 05:45:09 +0000 (UTC) From: Christopher Baines Date: Sat, 24 Apr 2021 06:45:09 +0100 Message-Id: <20210424054509.7740-1-mail@cbaines.net> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I'm looking at this to help with adding support for looking up package replacements to store in the Guix Data Service. * guix/inferior.scm (inferior-package-replacement): New procedure. --- guix/inferior.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/guix/inferior.scm b/guix/inferior.scm index eb457f81f9..19607724c0 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -90,6 +90,7 @@ inferior-package-native-search-paths inferior-package-transitive-native-search-paths inferior-package-search-paths + inferior-package-replacement inferior-package-provenance inferior-package-derivation @@ -462,6 +463,25 @@ package." (define inferior-package-transitive-native-search-paths (cut %inferior-package-search-paths <> 'package-transitive-native-search-paths)) +(define (inferior-package-replacement package) + (match (inferior-package-field + package + '(compose (match-lambda + ((? package? package) + (let ((id (object-address package))) + (hashv-set! %package-table id package) + (list id + (package-name package) + (package-version package)))) + (#f #f)) + package-replacement)) + (#f #f) + ((id name version) + (inferior-package (inferior-package-inferior package) + name + version + id)))) + (define (inferior-package-provenance package) "Return a \"provenance sexp\" for PACKAGE, an inferior package. The result is similar to the sexp returned by 'package-provenance' for regular packages."