From: Alex Sassmannshausen <alex@pompo.co>
To: guix-devel@gnu.org
Subject: [PATCH] import: cpan: Use our mirrors for 'https' URLs.
Date: Sat, 2 Jul 2016 20:06:02 +0200 [thread overview]
Message-ID: <20160702180602.26453-2-alex@pompo.co> (raw)
In-Reply-To: <20160702180602.26453-1-alex@pompo.co>
* 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 © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -99,6 +100,13 @@ or #f on failure. MODULE should be e.g. \"Test::Script\""
(define (cpan-home name)
(string-append "http://search.cpan.org/dist/" name))
+(define (fix-source-url download-url)
+ "Return a new download URL based on DOWNLOAD-URL which now uses our mirrors,
+if the original's domain was metacpan."
+ (regexp-substitute/global #f "http[s]?://cpan.metacpan.org" download-url
+ 'pre "mirror://cpan" 'post))
+
+
(define %corelist
(delay
(let* ((perl (with-store store
@@ -183,10 +191,7 @@ META."
(list (list guix-name
(list 'quasiquote inputs))))))
- (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")))
(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 © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -97,4 +98,14 @@
(x
(pk 'fail x #f)))))
+(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")
--
2.8.4
next prev parent reply other threads:[~2016-07-02 18:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-02 18:06 [PATCH] Fix cpan importer source-url generator Alex Sassmannshausen
2016-07-02 18:06 ` Alex Sassmannshausen [this message]
2016-07-03 22:00 ` [PATCH] import: cpan: Use our mirrors for 'https' URLs Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160702180602.26453-2-alex@pompo.co \
--to=alex@pompo.co \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).