diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
commit | 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e (patch) | |
tree | 6fa0f8ba32b83a996625bc188903ccebfb7e7c2c /guix/import/crate.scm | |
parent | 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 (diff) | |
parent | 229f4fa9522fb56b014ee9c0d8111e8fb6da764d (diff) | |
download | guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
Diffstat (limited to 'guix/import/crate.scm')
-rw-r--r-- | guix/import/crate.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 0b4482e876..e3ec11d7f8 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -201,14 +201,16 @@ latest version of CRATE-NAME." (lookup-crate crate-name)) (define version-number - (or version - (crate-latest-version crate))) + (and crate + (or version + (crate-latest-version crate)))) (define version* - (find (lambda (version) - (string=? (crate-version-number version) - version-number)) - (crate-versions crate))) + (and crate + (find (lambda (version) + (string=? (crate-version-number version) + version-number)) + (crate-versions crate)))) (and crate version* (let* ((dependencies (crate-version-dependencies version*)) |