me
/
guix
Archived
1
0
Fork 0
Code

import: crate: Memorize crate->guix-package. 

This adds memorization to procedures that involve network lookups.
'lookup-crate*' is used on every dependency of a package to get its version
list. It is also used to lookup a package's metadata. 'crate-recursive-import'
is also memorized since creating the same package twice will trigger a lookup
on its dependencies.

* guix/import/crate.scm (lookup-crate*): New procedure.
  (crate->guix-package): Memorize package metadata lookups.
  (crate-recursive-import): Memorize package creation.
master
Martin Becze 2020-01-30 11:17:00 -05:00 committed by Hartmut Goebel
parent 269c1db41b
commit d9feb23e10
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/import/crate.scm
View File

@ -27,6 +27,7 @@
#:use-module (guix import json) #:use-module (guix import json)
#:use-module (guix import utils) #:use-module (guix import utils)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix memoization)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix upstream) #:use-module (guix upstream)
@ -110,6 +111,8 @@ record or #f if it was not found."
(json->crate `(,@alist (json->crate `(,@alist
("actual_versions" . ,versions)))))))) ("actual_versions" . ,versions))))))))
(define lookup-crate* (memoize lookup-crate))
(define (crate-version-dependencies version) (define (crate-version-dependencies version)
"Return the list of <crate-dependency> records of VERSION, a "Return the list of <crate-dependency> records of VERSION, a
<crate-version>." <crate-version>."
@ -215,7 +218,7 @@ version of CRATE-NAME."
(eq? (crate-dependency-kind dependency) 'normal))) (eq? (crate-dependency-kind dependency) 'normal)))
(define crate (define crate
(lookup-crate crate-name)) (lookup-crate* crate-name))
(define version-number (define version-number
(and crate (and crate
@ -247,7 +250,7 @@ version of CRATE-NAME."
(define (sort-map-dependencies deps) (define (sort-map-dependencies deps)
(sort (map (lambda (dep) (sort (map (lambda (dep)
(let* ((name (crate-dependency-id dep)) (let* ((name (crate-dependency-id dep))
(crate (lookup-crate name)) (crate (lookup-crate* name))
(req (crate-dependency-requirement dep)) (req (crate-dependency-requirement dep))
(ver (find-crate-version crate req))) (ver (find-crate-version crate req)))
(list name (list name
@ -276,7 +279,7 @@ version of CRATE-NAME."
(define* (crate-recursive-import crate-name #:key version) (define* (crate-recursive-import crate-name #:key version)
(recursive-import crate-name (recursive-import crate-name
#:repo->guix-package crate->guix-package #:repo->guix-package (memoize crate->guix-package)
#:version version #:version version
#:guix-name crate-name->package-name)) #:guix-name crate-name->package-name))