[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: import: hackage: Silence download output.
From: |
Eric Bavier |
Subject: |
02/03: import: hackage: Silence download output. |
Date: |
Thu, 31 Mar 2016 04:22:49 +0000 |
bavier pushed a commit to branch master
in repository guix.
commit 2ae9c63f159c883f894d20cdcb222e96c3fa1802
Author: Eric Bavier <address@hidden>
Date: Tue Mar 22 22:38:54 2016 -0500
import: hackage: Silence download output.
* guix/import/hackage.scm (hackage-fetch): Use http-fetch to avoid
progress output from url-fetch.
---
guix/import/hackage.scm | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index e795762..4f14df4 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -26,6 +26,7 @@
#:use-module ((guix utils) #:select (package-name->name+version
canonical-newline-port))
#:use-module (guix import utils)
+ #:use-module (guix http-client)
#:use-module (guix import cabal)
#:use-module (guix store)
#:use-module (guix hash)
@@ -92,13 +93,12 @@ version is returned."
"Return the Cabal file for the package NAME-VERSION, or #f on failure. If
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) (hackage-cabal-url name version)))
- (call-with-temporary-output-file
- (lambda (temp port)
- (and (url-fetch url temp)
- (call-with-input-file temp
- (compose read-cabal canonical-newline-port)))))))
+ (let-values (((name version) (package-name->name+version name-version)))
+ (let* ((url (hackage-cabal-url name version))
+ (port (http-fetch url))
+ (result (read-cabal (canonical-newline-port port))))
+ (close-port port)
+ result)))
(define string->license
;; List of valid values from