From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Sassmannshausen Subject: [PATCH] import: cpan: Use our mirrors for 'https' URLs. Date: Sat, 2 Jul 2016 20:06:02 +0200 Message-ID: <20160702180602.26453-2-alex@pompo.co> References: <20160702180602.26453-1-alex@pompo.co> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJPJ8-0001lC-HO for guix-devel@gnu.org; Sat, 02 Jul 2016 14:06:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJPJ5-0004O7-9s for guix-devel@gnu.org; Sat, 02 Jul 2016 14:06:22 -0400 Received: from mail.pompo.co ([87.243.223.35]:35551 helo=ronja.pompo.co) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJPJ4-0004Nv-UC for guix-devel@gnu.org; Sat, 02 Jul 2016 14:06:19 -0400 In-Reply-To: <20160702180602.26453-1-alex@pompo.co> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * guix/import/cpan.scm (fix-source-url): New procedure. (cpan-module->sexp): Use it to construct our source-url. * tests/cpan.scm: Add tests for fix-source-url. --- guix/import/cpan.scm | 13 +++++++++---- tests/cpan.scm | 11 +++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index ad61ee7..213a155 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014 Eric Bavier ;;; Copyright =C2=A9 2015 Mark H Weaver +;;; Copyright =C2=A9 2016 Alex Sassmannshausen ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,13 @@ or #f on failure. MODULE should be e.g. \"Test::Scri= pt\"" (define (cpan-home name) (string-append "http://search.cpan.org/dist/" name)) =20 +(define (fix-source-url download-url) + "Return a new download URL based on DOWNLOAD-URL which now uses our mi= rrors, +if the original's domain was metacpan." + (regexp-substitute/global #f "http[s]?://cpan.metacpan.org" download-u= rl + 'pre "mirror://cpan" 'post)) + + (define %corelist (delay (let* ((perl (with-store store @@ -183,10 +191,7 @@ META." (list (list guix-name (list 'quasiquote inputs)))))) =20 - (define source-url - (regexp-substitute/global #f "http://cpan.metacpan.org" - (assoc-ref meta "download_url") - 'pre "mirror://cpan" 'post)) + (define source-url (fix-source-url (assoc-ref meta "download_url"))) =20 (let ((tarball (with-store store (download-to-store store source-url)))) diff --git a/tests/cpan.scm b/tests/cpan.scm index 5d56f0b..898081b 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Eric Bavier +;;; Copyright =C2=A9 2016 Alex Sassmannshausen ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,4 +98,14 @@ (x (pk 'fail x #f))))) =20 +(test-equal "source-url-http" + ((@@ (guix import cpan) fix-source-url) + "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") + "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") + +(test-equal "source-url-https" + ((@@ (guix import cpan) fix-source-url) + "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") + "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") + (test-end "cpan") --=20 2.8.4