[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#73833] [PATCH] guix: import: composer: Improve composer-fetch.
From: |
Nicolas Graves |
Subject: |
[bug#73833] [PATCH] guix: import: composer: Improve composer-fetch. |
Date: |
Wed, 16 Oct 2024 07:29:49 +0200 |
* guix/import/composer.scm (composer-fetch): Handle a case where
packages are #f. This improves composer-fetch behavior, which was
sometimes buggy.
---
guix/import/composer.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/guix/import/composer.scm b/guix/import/composer.scm
index abc9023be4..febde97791 100644
--- a/guix/import/composer.scm
+++ b/guix/import/composer.scm
@@ -111,7 +111,7 @@ (define* (composer-fetch name #:key (version #f))
(let ((pkgs (assoc-ref pkg "packages")))
(or (assoc-ref pkgs name) pkg))))))
(if packages
- (json->composer-package
+ (and=>
(if version
(assoc-ref packages version)
(cdr
@@ -125,7 +125,8 @@ (define* (composer-fetch name #:key (version #f))
cur-max))
(_ cur-max)))
(cons* "0.0.0" #f)
- packages))))
+ packages)))
+ json->composer-package)
#f)))
(define (php-package-name name)
--
2.46.0
- [bug#73833] [PATCH] guix: import: composer: Improve composer-fetch.,
Nicolas Graves <=
- [bug#73833] [PATCH v2 0/5] Large improvements to import utils, composer import, and refresh., Nicolas Graves, 2024/10/17
- [bug#73833] [PATCH v2 4/5] guix: refresh: Keep the version field of each update specification., Nicolas Graves, 2024/10/17
- [bug#73833] [PATCH v2 1/5] guix: import: utils: Add function git->origin., Nicolas Graves, 2024/10/17
- [bug#73833] [PATCH v2 3/5] guix: import: composer: Improve importer., Nicolas Graves, 2024/10/17
- [bug#73833] [PATCH v2 5/5] guix: refresh: Implement basic upstream-source-inputs rich updates., Nicolas Graves, 2024/10/17
- [bug#73833] [PATCH v2 2/5] tests: go: Add mock-git->origin function., Nicolas Graves, 2024/10/17