diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-07-03 22:45:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-07-03 23:53:31 +0200 |
| commit | 00290e7365aed9b34603bfb3cd6e8a4bdc1e7259 (patch) | |
| tree | 8ae5c67671bb571101eaf25c145dbe31230efed8 /guix/import/pypi.scm | |
| parent | 37c3e0bbaf2efe137b434f866ca431803d33e0a9 (diff) | |
| download | guix-00290e7365aed9b34603bfb3cd6e8a4bdc1e7259.tar guix-00290e7365aed9b34603bfb3cd6e8a4bdc1e7259.tar.gz | |
upstream: Define 'url-predicate' and use it.
* guix/upstream.scm (url-predicate): New procedure.
(url-prefix-predicate): Define in terms of 'url-predicate'.
* guix/import/cpan.scm (cpan-package?): Use 'url-predicate'.
* guix/import/cran.scm (cran-package?)
(bioconductor-package?)
(bioconductor-data-package?)
(bioconductor-experiment-package?): Likewise.
* guix/import/crate.scm (crate-package?): Likewise.
* guix/import/elpa.scm (package-from-gnu.org?): Likewise.
* guix/import/hackage.scm (hackage-package?): Likewise.
* guix/import/pypi.scm (pypi-package?): Likewise.
* guix/import/gem.scm (gem-package?): Use 'url-prefix-predicate'.
Diffstat (limited to 'guix/import/pypi.scm')
| -rw-r--r-- | guix/import/pypi.scm | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index f93fa8831f..b20c2300f6 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -510,23 +510,13 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." ("MPL 2.0" license:mpl2.0) (_ #f))) -(define (pypi-package? package) - "Return true if PACKAGE is a Python package from PyPI." - - (define (pypi-url? url) - (or (string-prefix? "https://pypi.org/" url) - (string-prefix? "https://pypi.python.org/" url) - (string-prefix? "https://pypi.org/packages" url) - (string-prefix? "https://files.pythonhosted.org/packages" url))) - - (let ((source-url (and=> (package-source package) origin-uri)) - (fetch-method (and=> (package-source package) origin-method))) - (and (eq? fetch-method download:url-fetch) - (match source-url - ((? string?) - (pypi-url? source-url)) - ((source-url ...) - (any pypi-url? source-url)))))) +(define pypi-package? + (url-predicate + (lambda (url) + (or (string-prefix? "https://pypi.org/" url) + (string-prefix? "https://pypi.python.org/" url) + (string-prefix? "https://pypi.org/packages" url) + (string-prefix? "https://files.pythonhosted.org/packages" url))))) (define (latest-release package) "Return an <upstream-source> for the latest release of PACKAGE." |