gnu: guile-hall: Update to 0.2.

* gnu/packages/guile-xyz.scm (guile-hall): Update to 0.2.
This commit is contained in:
Alex Sassmannshausen 2019-02-15 16:55:42 +01:00
parent e191e84859
commit 63bf0afdf6
No known key found for this signature in database
GPG Key ID: 8BC4F4476E8A8E00
1 changed files with 64 additions and 51 deletions

View File

@ -1251,17 +1251,16 @@ above command-line parameters.")
(define-public guile-hall (define-public guile-hall
(package (package
(name "guile-hall") (name "guile-hall")
(version "0.1.1") (version "0.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/a-sassmannshausen/guile-hall") (url "https://gitlab.com/a-sassmannshausen/guile-hall")
(commit "7d1094a12fe917209ce5b76c681cc8c862d4c65b"))) (commit "54aeeb088ea2f1168090b7cdb95e3e70884f52f3")))
(file-name "guile-hall-0.1.1-checkout") (file-name "guile-hall-0.2-checkout")
(sha256 (sha256 (base32
(base32 "1bkbqgj24xh5b65sw2m98iggpi67b72szx1dsiq3cpzlcxplmgaz"))))
"03kb09cjca98hlbx9mj12mqinzsnnvp6ci6i975n88pjhaxigyp1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules `(#:modules
@ -1269,31 +1268,47 @@ above command-line parameters.")
(ice-9 ftw) (ice-9 ftw)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases
%standard-phases
(add-after 'install 'hall-wrap-binaries (add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((compiled-dir
(lambda (out version)
(string-append
out "/lib/guile/" version "/site-ccache")))
(uncompiled-dir
(lambda (out version)
(string-append
out "/share/guile/site"
(if (string-null? version) "" "/") version)))
(dep-path
(lambda (env modules path)
(list env ":" 'prefix
(cons modules
(map (lambda (input)
(string-append
(assoc-ref inputs input)
path))
,''("guile-config"))))))
(out (assoc-ref outputs "out"))
(bin (string-append out "/bin/")) (bin (string-append out "/bin/"))
(site (string-append out "/share/guile/site")) (site (uncompiled-dir out "")))
(config (assoc-ref inputs "guile-config")))
(match (scandir site) (match (scandir site)
(("." ".." version) (("." ".." version)
(let ((modules (string-append site "/" version)) (for-each
(compiled-modules (string-append (lambda (file)
out "/lib/guile/" version (wrap-program
"/site-ccache"))) (string-append bin file)
(wrap-program (string-append bin "hall") (dep-path
`("GUILE_LOAD_PATH" ":" prefix "GUILE_LOAD_PATH"
(,modules (uncompiled-dir out version)
,(string-append config (uncompiled-dir "" version))
"/share/guile/site/" (dep-path
version))) "GUILE_LOAD_COMPILED_PATH"
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (compiled-dir out version)
(,compiled-modules (compiled-dir "" version))))
,(string-append config "/lib/guile/" ,''("hall"))
version #t))))))))
"/site-ccache"))))
#t)))))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -1301,15 +1316,13 @@ above command-line parameters.")
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2)))
(propagated-inputs (propagated-inputs
`(("guile-config" ,guile-config))) `(("guile-config" ,guile-config "out")))
(synopsis "Guile project tooling") (synopsis "Guile project tooling")
(description (description
"Hall is a command-line application and a set of Guile libraries that "Hall is a command-line application and a set of Guile libraries that allow you to quickly create and publish Guile projects. It allows you to transparently support the GNU build system, manage a project hierarchy & provides tight coupling to Guix.")
allow you to quickly create and publish Guile projects. It allows you to (home-page
transparently support the GNU build system, manage a project hierarchy & "https://gitlab.com/a-sassmannshausen/guile-hall")
provides tight coupling to Guix.") (license gpl3+)))
(home-page "https://gitlab.com/a-sassmannshausen/guile-hall")
(license license:gpl3+)))
(define-public guile-ics (define-public guile-ics
(package (package