1. call-with-downloaded-file had behaviour different to how it was documented to behave. This was primarily a problem when trying to import packages with no description (eg. color-theme-solarized on melpa).
2. Package dependencies need to be propagated so that emacs can find them.
From 0e561aee91b5d389d72906d059ddf486a322f20a Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro <ca...@zancanaro.id.au> Date: Wed, 14 Dec 2016 12:31:12 +1100 Subject: [PATCH 1/2] import: elpa: Fix call-with-downloaded-file * guix/import/elpa.scm (call-with-downloaded-file): Make function behaviour match documentation string. --- guix/import/elpa.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 320a09e8c..5f8b7a9e5 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -89,7 +89,13 @@ NAMES (strings)." "Fetch URL, store the content in a temporary file and call PROC with that file. Returns the value returned by PROC. On error call ERROR-THUNK and return its value or leave if it's false." - (proc (http-fetch/cached (string->uri url)))) + (catch #t + (lambda () + (proc (http-fetch/cached (string->uri url)))) + (lambda (key . args) + (if error-thunk + (error-thunk) + (apply throw key args))))) (define (is-elpa-package? name elpa-pkg-spec) "Return true if the string NAME corresponds to the name of the package -- 2.11.0
From 88f23b9c369841837a83225b52e19f4c029906ab Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro <ca...@zancanaro.id.au> Date: Wed, 14 Dec 2016 12:34:15 +1100 Subject: [PATCH 2/2] import: elpa: Import dependencies as propagated-inputs * guix/import/elpa.scm (elpa-package->sexp): Import dependencies as propagated-inputs. --- guix/import/elpa.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 5f8b7a9e5..897ce6a69 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -228,7 +228,7 @@ type '<elpa-package>'." (bytevector->nix-base32-string (file-sha256 tarball)) "failed to download package"))))) (build-system emacs-build-system) - ,@(maybe-inputs 'inputs dependencies) + ,@(maybe-inputs 'propagated-inputs dependencies) (home-page ,(elpa-package-home-page pkg)) (synopsis ,(elpa-package-synopsis pkg)) (description ,(elpa-package-description pkg)) -- 2.11.0
signature.asc
Description: PGP signature