[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: import: opam: opam->guix-package: Fix default repo argument.
From: |
guix-commits |
Subject: |
05/08: import: opam: opam->guix-package: Fix default repo argument. |
Date: |
Sat, 8 Apr 2023 18:09:42 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit ba88f0414bc309ef00e546fcd20a6b0dd2499f5c
Author: Csepp <raingloom@riseup.net>
AuthorDate: Tue Mar 21 23:59:52 2023 +0100
import: opam: opam->guix-package: Fix default repo argument.
* guix/import/opam.scm (opam->guix-package): Make default repo a list of
strings. Update docstring.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
guix/import/opam.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/guix/import/opam.scm b/guix/import/opam.scm
index eed68e7a93..e67146e593 100644
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@ -336,10 +336,9 @@ path to the repository."
(sha256 (base32 ,(guix-hash-url temp)))))))
'no-source-information)))
-(define* (opam->guix-package name #:key (repo 'opam) version
#:allow-other-keys)
- "Import OPAM package NAME from REPOSITORY (a directory name) or, if
-REPOSITORY is #f, from the official OPAM repository. Return a 'package' sexp
-or #f on failure."
+(define* (opam->guix-package name #:key (repo '("opam")) version
#:allow-other-keys)
+ "Import OPAM package NAME from REPO, a list of repository names, URLs, or
+file names. Return a 'package' sexp or #f on failure."
(and-let* ((with-opam (if (member "opam" repo) repo (cons "opam" repo)))
(opam-file (opam-fetch name with-opam))
(version (assoc-ref opam-file "version"))
- branch master updated (b08cdfc6d3 -> c1262edba9), guix-commits, 2023/04/08
- 06/08: import: opam: Tweak doc for '--repo' option., guix-commits, 2023/04/08
- 02/08: home: Add gpg-agent service., guix-commits, 2023/04/08
- 03/08: nls: Make sure gnu/home/services/*.scm files are translatable., guix-commits, 2023/04/08
- 01/08: import: Properly report "no specific version" errors., guix-commits, 2023/04/08
- 07/08: gnu: gerbil: Update to 0.17.0., guix-commits, 2023/04/08
- 08/08: gnu: gerbil: Use G-expressions., guix-commits, 2023/04/08
- 04/08: svn-download: Default to non-recursive checkouts., guix-commits, 2023/04/08
- 05/08: import: opam: opam->guix-package: Fix default repo argument.,
guix-commits <=