TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

import: hackage: Handle CRLF end of line style.

Browse source 
* guix/import/hackage.scm (hackage-fetch, hackage->guix-package): Use
  'canonical-newline-port'.
This commit is contained in:
Federico Beffa 2015-11-14 15:15:00 +01:00
parent c8be6f0d4a
commit 96018e21e7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
guix/import/hackage.scm
View file

@ -22,7 +22,8 @@ (define-module (guix import hackage)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module ((guix download) #:select (download-to-store)) #: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 utils)
#:use-module (guix import cabal) #:use-module (guix import cabal)
#:use-module (guix store) #:use-module (guix store)
@ -84,7 +85,8 @@ (define (hackage-fetch name-version)
(call-with-temporary-output-file (call-with-temporary-output-file
(lambda (temp port) (lambda (temp port)
(and (url-fetch url temp) (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 (define string->license
;; List of valid values from ;; List of valid values from
@ -216,7 +218,7 @@ (define* (hackage->guix-package package-name #:key
keys \"os\", \"arch\" and \"impl\" is \"linux\", \"x86_64\" and \"ghc\" keys \"os\", \"arch\" and \"impl\" is \"linux\", \"x86_64\" and \"ghc\"
respectively." respectively."
(let ((cabal-meta (if port (let ((cabal-meta (if port
(read-cabal port) (read-cabal (canonical-newline-port port))
(hackage-fetch package-name)))) (hackage-fetch package-name))))
(and=> cabal-meta (compose (cut hackage-module->sexp <> (and=> cabal-meta (compose (cut hackage-module->sexp <>
#:include-test-dependencies? #:include-test-dependencies?