nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: cuirass: Update snapshot; switch to Guile 2.2. 

* gnu/packages/ci.scm (cuirass): Update to commit 870e8d6.  Increment
REVISION.
[source]: Change URL to git.savannah.gnu.org.
[arguments]: Add #:modules.  In 'wrap-program' phase, get the Guile
effective version and honor it.
[inputs]: Use GUILE-2.2 instead of GUILE-2.0 and GUILE2.2-JSON instead
of GUILE-JSON.
[home-page]: Set to the Guix home page.
This commit is contained in:
Ludovic Courtès 2017-05-10 17:03:49 +02:00
parent 99bde93b83
commit 0d43b12d1d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/ci.scm
View File

@ -187,23 +187,28 @@ their dependencies.")
(license l:gpl3+)))) (license l:gpl3+))))
(define-public cuirass (define-public cuirass
(let ((commit "8c811abb3174b44601b8996a1fe1718f37d7bd14") (let ((commit "870e8d6ad3415ac61c52e57095fcc6164023a0fc")
(revision "5")) (revision "6"))
(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)))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://notabug.org/mthl/cuirass") (url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git")
(commit commit))) (commit commit)))
(file-name (string-append name "-" version)) (file-name (string-append name "-" version))
(sha256 (sha256
(base32 (base32
"0kz2ys01xlmxagsfr9qf3p212vm31wfl76rvxa7ii5804aidlz5n")))) "0lp5a5p42k7lml15lbmmd7az9i0gw5kips3sh3awd2z79h0w2knw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:modules ((guix build utils)
(guix build gnu-build-system)
(ice-9 rdelim)
(ice-9 popen))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-repo-tests (add-after 'unpack 'disable-repo-tests
(λ _ (λ _
@ -221,9 +226,17 @@ their dependencies.")
(sqlite (assoc-ref inputs "guile-sqlite3")) (sqlite (assoc-ref inputs "guile-sqlite3"))
(git (assoc-ref inputs "git")) (git (assoc-ref inputs "git"))
(guix (assoc-ref inputs "guix")) (guix (assoc-ref inputs "guix"))
(mods (string-append json "/share/guile/site/2.0:" (guile (assoc-ref %build-inputs "guile"))
sqlite "/share/guile/site/2.0:" (effective (read-line
guix "/share/guile/site/2.0"))) (open-pipe* OPEN_READ
(string-append guile "/bin/guile")
"-c" "(display (effective-version))")))
(mods (string-append json "/share/guile/site/"
effective ":"
sqlite "/share/guile/site/"
effective ":"
guix "/share/guile/site/"
effective)))
;; Make sure 'cuirass' can find the 'git' and 'evaluate' ;; Make sure 'cuirass' can find the 'git' and 'evaluate'
;; commands, as well as the relevant Guile modules. ;; commands, as well as the relevant Guile modules.
(wrap-program (string-append out "/bin/cuirass") (wrap-program (string-append out "/bin/cuirass")
@ -233,8 +246,8 @@ their dependencies.")
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,mods))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,mods)))
#t)))))) #t))))))
(inputs (inputs
`(("guile" ,guile-2.0) `(("guile" ,guile-2.2)
("guile-json" ,guile-json) ("guile-json" ,guile2.2-json)
("guile-sqlite3" ,guile-sqlite3) ("guile-sqlite3" ,guile-sqlite3)
("guix" ,guix) ("guix" ,guix)
("git" ,git))) ("git" ,git)))
@ -247,5 +260,5 @@ their dependencies.")
(description (description
"Cuirass is a continuous integration tool using GNU Guix. It is "Cuirass is a continuous integration tool using GNU Guix. It is
intended as a replacement for Hydra.") intended as a replacement for Hydra.")
(home-page "https://notabug.org/mthl/cuirass") (home-page "https://www.gnu.org/software/guix/")
(license l:gpl3+)))) (license l:gpl3+))))