diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-02 15:39:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-02 15:39:50 +0200 |
| commit | 072e10615fc786db02dc44f3cd5f25aed2969111 (patch) | |
| tree | dbae10eaf8cf13a28c0151a418971fb770243eda /guix/import | |
| parent | 3964e358ab65dfd157427560bfb44de8a150068b (diff) | |
| parent | 135ba811c6f55c22bfa8969143d83e7fdf166763 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/cpan.scm | 4 | ||||
| -rw-r--r-- | guix/import/hackage.scm | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 213a155fd6..5b7c47554a 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -83,7 +83,7 @@ "Return the base distribution module for a given module. E.g. the 'ok' module is distributed with 'Test::Simple', so (module->dist-name \"ok\") would return \"Test-Simple\"" - (assoc-ref (json-fetch (string-append "http://api.metacpan.org/module/" + (assoc-ref (json-fetch (string-append "https://api.metacpan.org/module/" module)) "distribution")) @@ -91,7 +91,7 @@ return \"Test-Simple\"" "Return an alist representation of the CPAN metadata for the perl module MODULE, or #f on failure. MODULE should be e.g. \"Test::Script\"" ;; This API always returns the latest release of the module. - (json-fetch (string-append "http://api.metacpan.org/release/" + (json-fetch (string-append "https://api.metacpan.org/release/" ;; XXX: The 'release' api requires the "release" ;; name of the package. This substitution seems ;; reasonably consistent across packages. diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index f07f453e11..9af78ea888 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> +;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,7 +75,7 @@ (define (hackage-source-url name version) "Given a Hackage package NAME and VERSION, return a url to the source tarball." - (string-append "http://hackage.haskell.org/package/" name + (string-append "https://hackage.haskell.org/package/" name "/" name "-" version ".tar.gz")) (define* (hackage-cabal-url name #:optional version) @@ -82,9 +83,9 @@ tarball." .cabal file on Hackage. If VERSION is #f or missing, the url for the latest version is returned." (if version - (string-append "http://hackage.haskell.org/package/" + (string-append "https://hackage.haskell.org/package/" name "-" version "/" name ".cabal") - (string-append "http://hackage.haskell.org/package/" + (string-append "https://hackage.haskell.org/package/" name "/" name ".cabal"))) (define (hackage-name->package-name name) |