me/guix
Archived
1
0
Fork 0
Code Activity

inferior: Support querying package replacements.

Browse source 
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.
This commit is contained in:
Christopher Baines 2021-04-24 06:43:46 +01:00
parent b149c16371
commit 97d615b176
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
guix/inferior.scm
View file

@ -90,6 +90,7 @@
inferior-package-native-search-paths inferior-package-native-search-paths
inferior-package-transitive-native-search-paths inferior-package-transitive-native-search-paths
inferior-package-search-paths inferior-package-search-paths
inferior-package-replacement
inferior-package-provenance inferior-package-provenance
inferior-package-derivation inferior-package-derivation
@ -462,6 +463,27 @@ package."
(define inferior-package-transitive-native-search-paths (define inferior-package-transitive-native-search-paths
(cut %inferior-package-search-paths <> '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) (define (inferior-package-provenance package)
"Return a \"provenance sexp\" for PACKAGE, an inferior package. The result "Return a \"provenance sexp\" for PACKAGE, an inferior package. The result
is similar to the sexp returned by 'package-provenance' for regular packages." is similar to the sexp returned by 'package-provenance' for regular packages."

20
tests/inferior.scm
View file

@ -26,6 +26,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages bootstrap) #:use-module (gnu packages bootstrap)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages sqlite)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-34) #:use-module (srfi srfi-34)
#:use-module (srfi srfi-64) #:use-module (srfi srfi-64)
@ -260,6 +261,25 @@
(list (inferior-package-derivation %store guile "x86_64-linux") (list (inferior-package-derivation %store guile "x86_64-linux")
(inferior-package-derivation %store guile "armhf-linux"))))) (inferior-package-derivation %store guile "armhf-linux")))))
(unless (package-replacement sqlite)
(test-skip 1))
(test-equal "inferior-package-replacement"
(package-derivation %store
(package-replacement 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
(inferior-package-replacement
inferior-sqlite)
"x86_64-linux")))))
(test-equal "inferior-package->manifest-entry" (test-equal "inferior-package->manifest-entry"
(manifest-entry->list (package->manifest-entry (manifest-entry->list (package->manifest-entry
(first (find-best-packages-by-name "guile" #f)))) (first (find-best-packages-by-name "guile" #f))))