[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: import: crate: Memorize crate->guix-package.
From: |
guix-commits |
Subject: |
04/08: import: crate: Memorize crate->guix-package. |
Date: |
Wed, 2 Dec 2020 16:10:10 -0500 (EST) |
htgoebel pushed a commit to branch master
in repository guix.
commit d9feb23e1044b59aaa457825ab5152eaf3bc8a68
Author: Martin Becze <mjbecze@riseup.net>
AuthorDate: Thu Jan 30 11:17:00 2020 -0500
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.
---
guix/import/crate.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 5498d1f..c830449 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -27,6 +27,7 @@
#:use-module (guix import json)
#:use-module (guix import utils)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix memoization)
#:use-module (guix monads)
#:use-module (guix packages)
#:use-module (guix upstream)
@@ -110,6 +111,8 @@ record or #f if it was not found."
(json->crate `(,@alist
("actual_versions" . ,versions))))))))
+(define lookup-crate* (memoize lookup-crate))
+
(define (crate-version-dependencies version)
"Return the list of <crate-dependency> records of VERSION, a
<crate-version>."
@@ -215,7 +218,7 @@ version of CRATE-NAME."
(eq? (crate-dependency-kind dependency) 'normal)))
(define crate
- (lookup-crate crate-name))
+ (lookup-crate* crate-name))
(define version-number
(and crate
@@ -247,7 +250,7 @@ version of CRATE-NAME."
(define (sort-map-dependencies deps)
(sort (map (lambda (dep)
(let* ((name (crate-dependency-id dep))
- (crate (lookup-crate name))
+ (crate (lookup-crate* name))
(req (crate-dependency-requirement dep))
(ver (find-crate-version crate req)))
(list name
@@ -276,7 +279,7 @@ version of CRATE-NAME."
(define* (crate-recursive-import crate-name #:key version)
(recursive-import crate-name
- #:repo->guix-package crate->guix-package
+ #:repo->guix-package (memoize crate->guix-package)
#:version version
#:guix-name crate-name->package-name))
- branch master updated (9a1b112 -> 054e308), guix-commits, 2020/12/02
- 03/08: import: crate: Use guile-semver to resolve module versions., guix-commits, 2020/12/02
- 04/08: import: crate: Memorize crate->guix-package.,
guix-commits <=
- 07/08: import: crate: Trim version for names after left-most non-zero part., guix-commits, 2020/12/02
- 06/08: import: utils: Trim patch version from names., guix-commits, 2020/12/02
- 05/08: import: crate: Parameterized importing of dev dependencies., guix-commits, 2020/12/02
- 08/08: import: crate: Use existing package satisfying semver requirement., guix-commits, 2020/12/02
- 02/08: import: utils: 'recursive-import' accepts an optional version parameter., guix-commits, 2020/12/02
- 01/08: guix: self: Add guile-semver as a depenedency., guix-commits, 2020/12/02