From 00290e7365aed9b34603bfb3cd6e8a4bdc1e7259 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Jul 2020 22:45:21 +0200 Subject: 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'. --- guix/import/gem.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'guix/import/gem.scm') diff --git a/guix/import/gem.scm b/guix/import/gem.scm index bd5d5b3569..a2d99ddbca 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -166,20 +166,8 @@ package on RubyGems." ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0) (_ #f))) -(define (gem-package? package) - "Return true if PACKAGE is a gem package from RubyGems." - - (define (rubygems-url? url) - (string-prefix? "https://rubygems.org/downloads/" 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?) - (rubygems-url? source-url)) - ((source-url ...) - (any rubygems-url? source-url)))))) +(define gem-package? + (url-prefix-predicate "https://rubygems.org/downloads/")) (define (latest-release package) "Return an for the latest release of PACKAGE." -- cgit v1.2.3