diff options
author | Nicolas Graves <ngraves@ngraves.fr> | 2024-04-06 04:08:51 +0200 |
---|---|---|
committer | Guix Patches Tester <> | 2024-04-17 14:27:13 +0200 |
commit | 0e15a01e4b27f235fb813470fae307555860ae88 (patch) | |
tree | dae57cf8ea901e23710774fb1bb9f6717a63a31f | |
parent | 1834e02e45cfc79d0eed1e35d063b74fabc27598 (diff) | |
download | guix-patches-issue-70227.tar guix-patches-issue-70227.tar.gz |
guix: import: composer: Implement recursive package refresh.issue-70227
* guix/import/composer.scm
(composer-fetch): Replace reduce by fold to correct version selection
logic.
(latest-release): Implement recursive package refresh. Rename to
import-release.
(import-release): New function, formerly known as latest-release.
Change-Id: I8f629b4d1da866f5986d39b4e159f2b44af9ee49
-rw-r--r-- | guix/import/composer.scm | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/guix/import/composer.scm b/guix/import/composer.scm index 75419ca63e..e2a60969aa 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -113,7 +113,7 @@ package NAME with optional VERSION, or #f on failure." (if version (assoc-ref packages version) (cdr - (reduce + (fold (lambda (new cur-max) (match new (((? valid-version? version) . tail) @@ -243,16 +243,32 @@ package in Packagist." (eq? (package-build-system package) composer-build-system) (string-prefix? "php-" (package-name package)))) -(define* (latest-release package #:key (version #f)) - "Return an <upstream-source> for the latest release of PACKAGE." +(define* (import-release package #:key (version #f)) + "Return an <upstream-source> for VERSION or the latest release of PACKAGE." (let* ((php-name (guix-package->composer-name package)) (composer-package (composer-fetch php-name #:version version))) (if composer-package - (upstream-source - (package (composer-package-name composer-package)) - (version (composer-package-version composer-package)) - (urls (list (composer-source-url - (composer-package-source composer-package))))) + (let* ((guix-name (composer-package-name composer-package)) + (inputs + (append + (map (lambda (dep) + (upstream-input + (name php-name) + (downstream-name guix-name) + (type 'regular))) + (composer-package-require composer-package)) + (map (lambda (dep) + (upstream-input + (name php-name) + (downstream-name guix-name) + (type 'native))) + (composer-package-dev-require composer-package))))) + (upstream-source + (package guix-name) + (version (composer-package-version composer-package)) + (urls (list (composer-source-url + (composer-package-source composer-package)))) + (inputs inputs))) (begin (warning (G_ "failed to parse ~a~%") php-name) #f)))) @@ -262,7 +278,7 @@ package in Packagist." (name 'composer) (description "Updater for Composer packages") (pred php-package?) - (import latest-release))) + (import import-release))) (define* (composer-recursive-import package-name #:optional version) (recursive-import package-name |