guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

180/244: import: opam: opam->guix-package: Fix default repo argument.


From: guix-commits
Subject: 180/244: import: opam: opam->guix-package: Fix default repo argument.
Date: Wed, 12 Apr 2023 08:49:22 -0400 (EDT)

apteryx pushed a commit to branch staging
in repository guix.

commit 571907c362602a20fed8f0bd53d581dd698dd187
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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]