Message ID | 20210514084200.5896-1-mail@cbaines.net |
---|---|
State | Accepted |
Headers | show |
Series | [bug#47986,v2] inferior: Support querying package replacements. | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
Hi, Christopher Baines <mail@cbaines.net> skribis: > 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. [...] > +(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"))))) Problem is that this test assumes sqlite has a replacement. Maybe precede it: (unless (package-replacement sqlite) (test-skip 1)) and remove (or (package-replacement …) …) and similar. That way we’ll notice when the test is skipped. Otherwise LGTM, thanks! Ludo’.
Ludovic Courtès <ludo@gnu.org> writes: > Hi, > > Christopher Baines <mail@cbaines.net> skribis: > >> 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. > > [...] > >> +(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"))))) > > Problem is that this test assumes sqlite has a replacement. Maybe > precede it: > > (unless (package-replacement sqlite) > (test-skip 1)) > > and remove (or (package-replacement …) …) and similar. > > That way we’ll notice when the test is skipped. Sure, I've made those changes now. > Otherwise LGTM, thanks! Great, I've pushed this as 97d615b1761c2054561057f6b56e2a0caed13aa4.
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))))