aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2016-03-22 22:40:38 -0500
committerEric Bavier <bavier@member.fsf.org>2016-03-30 23:19:24 -0500
commitf9ea74ad043cb1982467ae21dd967ba98b9ecd04 (patch)
tree81e384f8d2e848b86663c7bbfe02cf9ab8946ef3
parent4827b36d1f9bd3730fd7e4c0b9ff8b4d5066639c (diff)
downloadguix-f9ea74ad043cb1982467ae21dd967ba98b9ecd04.tar
guix-f9ea74ad043cb1982467ae21dd967ba98b9ecd04.tar.gz
import: hackage: Factorize url synthesis.
* guix/import/hackage.scm (hackage-source-url, hackage-cabal-url): New procedures. (hackage-fetch, hackage-module->sexp): Use them.
-rw-r--r--guix/import/hackage.scm27
1 files changed, 19 insertions, 8 deletions
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 8725ffa0df..e79576207b 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
+;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -65,6 +66,22 @@
(define package-name-prefix "ghc-")
+(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
+ "/" name "-" version ".tar.gz"))
+
+(define* (hackage-cabal-url name #:optional version)
+ "Given a Hackage package NAME and VERSION, return a url to the corresponding
+.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/"
+ name "-" version "/" name ".cabal")
+ (string-append "http://hackage.haskell.org/package/"
+ name "/" name ".cabal")))
+
(define (hackage-name->package-name name)
"Given the NAME of a Cabal package, return the corresponding Guix name."
(if (string-prefix? package-name-prefix name)
@@ -76,12 +93,7 @@
the version part is omitted from the package name, then return the latest
version."
(let*-values (((name version) (package-name->name+version name-version))
- ((url)
- (if version
- (string-append "http://hackage.haskell.org/package/"
- name "-" version "/" name ".cabal")
- (string-append "http://hackage.haskell.org/package/"
- name "/" name ".cabal"))))
+ ((url) (hackage-cabal-url name version)))
(call-with-temporary-output-file
(lambda (temp port)
(and (url-fetch url temp)
@@ -154,8 +166,7 @@ representation of a Cabal file as produced by 'read-cabal'."
(cabal-package-version cabal))
(define source-url
- (string-append "http://hackage.haskell.org/package/" name
- "/" name "-" version ".tar.gz"))
+ (hackage-source-url name version))
(define dependencies
(let ((names