>From 912e6fb0d35b43e3d1cf540702fa1905e704ce93 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Thu, 2 May 2019 00:46:56 +0530 Subject: [PATCH 06/10] Formatting Use: format-inputs instead of alist-sexp Signed-off-by: Amar Singh --- guix/import/golang.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/guix/import/golang.scm b/guix/import/golang.scm index e0ffca4b42..c0679990e1 100644 --- a/guix/import/golang.scm +++ b/guix/import/golang.scm @@ -136,8 +136,8 @@ (version version) (source (origin (method url-fetch) - (uri (go-name->tarball go-name version)) - (sha256 (base32 sha256)))) + (uri (go-name->tarball go-name version)) + (sha256 (base32 sha256)))) (home-page (go-name->url go-name)) (build-system @@ -146,16 +146,14 @@ `(#:import-path ,go-name)) ;; TODO: make inputs into (unquote ..) form (inputs - (alist-sexp (go-name->inputs go-name))) - (synopsis - (go-name->synopsis go-name readme-string)) - (description - (go-name->description go-name readme-string)) + (format-inputs (map go-name->guix-name (go-name->inputs go-name)))) + (synopsis (go-name->synopsis go-name)) + (description (go-name->description go-name)) ;; TODO: license ))) (define (filter-newlines string) - (string-filter (lambda (x) (not (equal? #\ x))) string)) + (string-filter (lambda (x) (not (equal? x #\newline))) string)) ;;; Ask the upstream to export variable? (define bv->nix-base32 (@@ (guix packages) -- 2.21.0