diff options
Diffstat (limited to 'guix/import/opam.scm')
| -rw-r--r-- | guix/import/opam.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guix/import/opam.scm b/guix/import/opam.scm index e336936306..e67146e593 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -29,6 +29,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module ((srfi srfi-26) #:select (cut)) + #:use-module (srfi srfi-34) #:use-module ((web uri) #:select (string->uri uri->string)) #:use-module ((guix build utils) #:select (dump-port find-files mkdir-p)) #:use-module (guix build-system) @@ -335,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")) @@ -417,7 +417,7 @@ package in OPAM." (define* (latest-release package #:key (version #f)) "Return an <upstream-source> for the latest release of PACKAGE." (when version - (error + (raise (formatted-message (G_ "~a updater doesn't support updating to a specific version, sorry.") "opam"))) |