From 571907c362602a20fed8f0bd53d581dd698dd187 Mon Sep 17 00:00:00 2001 From: Csepp Date: Tue, 21 Mar 2023 23:59:52 +0100 Subject: [PATCH] import: opam: opam->guix-package: Fix default repo argument. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/opam.scm (opam->guix-package): Make default repo a list of strings. Update docstring. Co-authored-by: Ludovic Courtès --- 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 @@ (define (opam->guix-source url-dict) (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"))