From patchwork Fri May 14 08:42:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 29291 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 02F6227BC81; Fri, 14 May 2021 09:43:19 +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_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 C235E27BC78 for ; Fri, 14 May 2021 09:43:18 +0100 (BST) Received: from localhost ([::1]:34592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhTPh-0002D5-VQ for patchwork@mira.cbaines.net; Fri, 14 May 2021 04:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhTPX-0002AO-MK for guix-patches@gnu.org; Fri, 14 May 2021 04:43:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lhTPR-0002uX-Rv for guix-patches@gnu.org; Fri, 14 May 2021 04:43:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lhTPR-00037V-PT for guix-patches@gnu.org; Fri, 14 May 2021 04:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47986] [PATCH v2] inferior: Support querying package replacements. References: <20210424054509.7740-1-mail@cbaines.net> In-Reply-To: <20210424054509.7740-1-mail@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 May 2021 08:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47986@debbugs.gnu.org Received: via spool by 47986-submit@debbugs.gnu.org id=B47986.162098172511930 (code B ref 47986); Fri, 14 May 2021 08:43:01 +0000 Received: (at 47986) by debbugs.gnu.org; 14 May 2021 08:42:05 +0000 Received: from localhost ([127.0.0.1]:44963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhTOX-00036L-3D for submit@debbugs.gnu.org; Fri, 14 May 2021 04:42:05 -0400 Received: from mira.cbaines.net ([212.71.252.8]:36002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhTOU-000361-HJ for 47986@debbugs.gnu.org; Fri, 14 May 2021 04:42:03 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 1EB4727BC78 for <47986@debbugs.gnu.org>; Fri, 14 May 2021 09:42:01 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4751a0d1 for <47986@debbugs.gnu.org>; Fri, 14 May 2021 08:42:00 +0000 (UTC) From: Christopher Baines Date: Fri, 14 May 2021 09:42:00 +0100 Message-Id: <20210514084200.5896-1-mail@cbaines.net> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" 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. * tests/inferior.scm ("inferior-package-replacement"): New test. --- guix/inferior.scm | 22 ++++++++++++++++++++++ tests/inferior.scm | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/guix/inferior.scm b/guix/inferior.scm index eb457f81f9..7c8e478f2a 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,27 @@ package." (define inferior-package-transitive-native-search-paths (cut %inferior-package-search-paths <> 'package-transitive-native-search-paths)) +(define (inferior-package-replacement package) + "Return the replacement for PACKAGE. This will either be an inferior +package, or #f." + (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." diff --git a/tests/inferior.scm b/tests/inferior.scm index f227e0b749..864bab86da 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (gnu packages bootstrap) #:use-module (gnu packages guile) + #:use-module (gnu packages sqlite) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64) @@ -260,6 +261,23 @@ (list (inferior-package-derivation %store guile "x86_64-linux") (inferior-package-derivation %store guile "armhf-linux"))))) +(test-equal "inferior-package-replacement" + (package-derivation %store + (or (package-replacement sqlite) sqlite) + "x86_64-linux") + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (packages (inferior-packages inferior))) + (match (lookup-inferior-packages inferior + (package-name sqlite) + (package-version sqlite)) + ((inferior-sqlite rest ...) + (inferior-package-derivation %store + (or (inferior-package-replacement + inferior-sqlite) + inferior-sqlite) + "x86_64-linux"))))) + (test-equal "inferior-package->manifest-entry" (manifest-entry->list (package->manifest-entry (first (find-best-packages-by-name "guile" #f))))