diff options
| author | Matthew James Kraai <kraai@ftbfs.org> | 2021-06-19 03:07:39 -0700 |
|---|---|---|
| committer | Brice Waegeneire <brice@waegenei.re> | 2021-06-19 22:20:08 +0200 |
| commit | 9171079e515289120405c70c143445df2a35db1c (patch) | |
| tree | 78505ee65af96f83c465afaaa3f2cf77ea8aaf9b /guix | |
| parent | 9fd9364492b95baf48baf054a326145fde5bc21b (diff) | |
| download | guix-patches-9171079e515289120405c70c143445df2a35db1c.tar guix-patches-9171079e515289120405c70c143445df2a35db1c.tar.gz | |
import: launchpad: Use repository to retrieve releases.
* guix/import/launchpad.scm (latest-released-version): Use repository instead
of package name.
(latest-release): Pass repository to latest-released-version.
Signed-off-by: Brice Waegeneire <brice@waegenei.re>
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/import/launchpad.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index a52b39a085..ecd6f88738 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,8 +101,8 @@ URL of the form (match (string-split (uri-path (string->uri url)) #\/) ((_ repo . rest) repo))) -(define (latest-released-version package-name) - "Return a string of the newest released version name given the PACKAGE-NAME, +(define (latest-released-version repository) + "Return a string of the newest released version name given the REPOSITORY, for example, 'linuxdcpp'. Return #f if there is no releases." (define (pre-release? x) ;; Versions containing anything other than digit characters and "." (for @@ -112,7 +113,7 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (match (json-fetch (string-append "https://api.launchpad.net/1.0/" - package-name "/releases")) + repository "/releases")) (#f #f) ;404 or similar (json (assoc-ref @@ -129,7 +130,8 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (let* ((source-uri (origin-github-uri (package-source pkg))) (name (package-name pkg)) - (newest-version (latest-released-version name))) + (repository (launchpad-repository source-uri)) + (newest-version (latest-released-version repository))) (if newest-version (upstream-source (package name) |