import: hackage: Default to https urls.

* guix/import/hackage.scm (hackage-source-url, hackage-cabal-url): Use https
for hackage.haskell.org.
This commit is contained in:
ng0 2016-08-30 12:08:21 +00:00 committed by Efraim Flashner
parent f409d0aacf
commit 18f7473504
No known key found for this signature in database
GPG key ID: F4C1D3917EACEE93

View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -74,7 +75,7 @@ (define package-name-prefix "ghc-")
(define (hackage-source-url name version) (define (hackage-source-url name version)
"Given a Hackage package NAME and VERSION, return a url to the source "Given a Hackage package NAME and VERSION, return a url to the source
tarball." tarball."
(string-append "http://hackage.haskell.org/package/" name (string-append "https://hackage.haskell.org/package/" name
"/" name "-" version ".tar.gz")) "/" name "-" version ".tar.gz"))
(define* (hackage-cabal-url name #:optional version) (define* (hackage-cabal-url name #:optional version)
@ -82,9 +83,9 @@ (define* (hackage-cabal-url name #:optional version)
.cabal file on Hackage. If VERSION is #f or missing, the url for the latest .cabal file on Hackage. If VERSION is #f or missing, the url for the latest
version is returned." version is returned."
(if version (if version
(string-append "http://hackage.haskell.org/package/" (string-append "https://hackage.haskell.org/package/"
name "-" version "/" name ".cabal") name "-" version "/" name ".cabal")
(string-append "http://hackage.haskell.org/package/" (string-append "https://hackage.haskell.org/package/"
name "/" name ".cabal"))) name "/" name ".cabal")))
(define (hackage-name->package-name name) (define (hackage-name->package-name name)