ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cuirass: Update to 0.0.1-7.6f85bc0.

Browse source 
* gnu/packages/ci.scm (cuirass): Update to 0.0.1-7.6f85bc0.
[arguments]: Add guile-git and guile-bytestructures to the load path.
[inputs]: Remove git, add guile-git and guile-bytestructures.
This commit is contained in:
Ricardo Wurmus 2017-08-17 09:11:14 +02:00
parent e3b861ce38
commit a6d05444ab
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/ci.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -186,8 +187,8 @@ (define-public hydra
(license l:gpl3+)))) (license l:gpl3+))))
(define-public cuirass (define-public cuirass
(let ((commit "870e8d6ad3415ac61c52e57095fcc6164023a0fc") (let ((commit "6f85bc04f31ae5853ceaa0bb3e1dedfe8412a189")
(revision "6")) (revision "7"))
(package (package
(name "cuirass") (name "cuirass")
(version (string-append "0.0.1-" revision "." (string-take commit 7))) (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -199,7 +200,7 @@ (define-public cuirass
(file-name (string-append name "-" version)) (file-name (string-append name "-" version))
(sha256 (sha256
(base32 (base32
"0lp5a5p42k7lml15lbmmd7az9i0gw5kips3sh3awd2z79h0w2knw")))) "1dglsa23z21m1s70420ar73qmg39fvdvwlz9xjz6lfp5s9mgzx15"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
@ -223,7 +224,8 @@ (define-public cuirass
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(json (assoc-ref inputs "guile-json")) (json (assoc-ref inputs "guile-json"))
(sqlite (assoc-ref inputs "guile-sqlite3")) (sqlite (assoc-ref inputs "guile-sqlite3"))
(git (assoc-ref inputs "git")) (git (assoc-ref inputs "guile-git"))
(bytes (assoc-ref inputs "guile-bytestructures"))
(guix (assoc-ref inputs "guix")) (guix (assoc-ref inputs "guix"))
(guile (assoc-ref %build-inputs "guile")) (guile (assoc-ref %build-inputs "guile"))
(effective (read-line (effective (read-line
@ -231,16 +233,19 @@ (define-public cuirass
(string-append guile "/bin/guile") (string-append guile "/bin/guile")
"-c" "(display (effective-version))"))) "-c" "(display (effective-version))")))
(mods (string-append json "/share/guile/site/" (mods (string-append json "/share/guile/site/"
effective ":"
git "/share/guile/site/"
effective ":"
bytes "/share/guile/site/"
effective ":" effective ":"
sqlite "/share/guile/site/" sqlite "/share/guile/site/"
effective ":" effective ":"
guix "/share/guile/site/" guix "/share/guile/site/"
effective))) effective)))
;; Make sure 'cuirass' can find the 'git' and 'evaluate' ;; Make sure 'cuirass' can find the 'evaluate' command, as
;; commands, as well as the relevant Guile modules. ;; well as the relevant Guile modules.
(wrap-program (string-append out "/bin/cuirass") (wrap-program (string-append out "/bin/cuirass")
`("PATH" ":" prefix (,(string-append out "/bin") `("PATH" ":" prefix (,(string-append out "/bin")))
,(string-append git "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods)) `("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,mods))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,mods)))
#t)))))) #t))))))
@ -248,8 +253,11 @@ (define-public cuirass
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
("guile-json" ,guile-json) ("guile-json" ,guile-json)
("guile-sqlite3" ,guile-sqlite3) ("guile-sqlite3" ,guile-sqlite3)
("guix" ,guix) ("guile-git" ,guile-git)
("git" ,git))) ;; FIXME: this is propagated by "guile-git", but it needs to be among
;; the inputs to add it to GUILE_LOAD_PATH.
("guile-bytestructures" ,guile-bytestructures)
("guix" ,guix)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)