diff options
| author | Federico Beffa <beffa@fbengineering.ch> | 2015-11-14 15:15:00 +0100 |
|---|---|---|
| committer | Federico Beffa <beffa@fbengineering.ch> | 2015-11-26 18:17:23 +0100 |
| commit | 96018e21e7a84c343c1a019fa5c6ef3c15fb24d6 (patch) | |
| tree | f9b59f252e2dc5ab7065d199ff64e9eb01b7f6d1 | |
| parent | c8be6f0d4a4ad72b1c0673c4cf11a65cd1079d8c (diff) | |
| download | guix-96018e21e7a84c343c1a019fa5c6ef3c15fb24d6.tar guix-96018e21e7a84c343c1a019fa5c6ef3c15fb24d6.tar.gz | |
import: hackage: Handle CRLF end of line style.
* guix/import/hackage.scm (hackage-fetch, hackage->guix-package): Use
'canonical-newline-port'.
| -rw-r--r-- | guix/import/hackage.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 3baa514aa1..8725ffa0df 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -22,7 +22,8 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-1) #:use-module ((guix download) #:select (download-to-store)) - #:use-module ((guix utils) #:select (package-name->name+version)) + #:use-module ((guix utils) #:select (package-name->name+version + canonical-newline-port)) #:use-module (guix import utils) #:use-module (guix import cabal) #:use-module (guix store) @@ -84,7 +85,8 @@ version." (call-with-temporary-output-file (lambda (temp port) (and (url-fetch url temp) - (call-with-input-file temp read-cabal)))))) + (call-with-input-file temp + (compose read-cabal canonical-newline-port))))))) (define string->license ;; List of valid values from @@ -216,7 +218,7 @@ to the Cabal file format definition. The default value associated with the keys \"os\", \"arch\" and \"impl\" is \"linux\", \"x86_64\" and \"ghc\" respectively." (let ((cabal-meta (if port - (read-cabal port) + (read-cabal (canonical-newline-port port)) (hackage-fetch package-name)))) (and=> cabal-meta (compose (cut hackage-module->sexp <> #:include-test-dependencies? |