[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"))
- 204/244: gnu: xfce4-screensaver: Update to 4.18.1., (continued)
- 204/244: gnu: xfce4-screensaver: Update to 4.18.1., guix-commits, 2023/04/12
- 207/244: gnu: emacs-treemacs: Update to 3.1., guix-commits, 2023/04/12
- 201/244: gnu: parole: Update to 4.18.0., guix-commits, 2023/04/12
- 233/244: gnu: restinio: Update to 0.6.18-0.eda471e and enable tests., guix-commits, 2023/04/12
- 210/244: gnu: emacs-citar-org-roam: Update to 0.5.1., guix-commits, 2023/04/12
- 230/244: gnu: libconfig: Replace config script helpers., guix-commits, 2023/04/12
- 226/244: gnu: cups-minimal: Fix cross-building to riscv64-linux., guix-commits, 2023/04/12
- 158/244: gnu: Remove abandoned spotify-tui package., guix-commits, 2023/04/12
- 159/244: gnu: Add sentencepiece., guix-commits, 2023/04/12
- 192/244: gnu: fcitx5-configtool: Update to 5.0.17., guix-commits, 2023/04/12
- 180/244: import: opam: opam->guix-package: Fix default repo argument.,
guix-commits <=
- 153/244: gnu: Add zix., guix-commits, 2023/04/12
- 154/244: gnu: libaudec: Update to 0.3.4., guix-commits, 2023/04/12
- 235/244: Revert "gnu: opendht: Update to 2.5.2.", guix-commits, 2023/04/12
- 168/244: gnu: scintilla: Update to 5.3.4., guix-commits, 2023/04/12
- 182/244: gnu: gerbil: Update to 0.17.0., guix-commits, 2023/04/12
- 209/244: gnu: emacs-flycheck-guile: Update to 0.5., guix-commits, 2023/04/12
- 172/244: gnu: gallery-dl: Update to 1.25.1., guix-commits, 2023/04/12
- 194/244: gnu: libxfce4ui: Update to 4.18.3., guix-commits, 2023/04/12
- 236/244: gnu: mu: Update to 1.10.2., guix-commits, 2023/04/12
- 181/244: import: opam: Tweak doc for '--repo' option., guix-commits, 2023/04/12