;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
-;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module ((guix licenses) #:prefix l:)
#:use-module (gnu packages)
#:use-module (guix packages)
- #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages version-control)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
- #:use-module (guix build-system gnu)
- #:use-module (guix build-system go))
+ #:use-module (guix build-system gnu))
(define-public cuirass
- (let ((commit "e20ff86d97f7dd92dad140b5919e3cbdf2fb1ce6")
- (revision "26"))
+ (let ((commit "cf11b73db00678b45b70108768138d0fb74d9506")
+ (revision "45"))
(package
(name "cuirass")
- (version (string-append "0.0.1-" revision "." (string-take commit 7)))
+ (version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git")
(commit commit)))
- (file-name (string-append name "-" version))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1c3rcfmx7vm13x3nid9xbl18rrqljh5vb71qxps4yqid75br4hrb"))))
+ "1f7jqnscy8vjqrpgl4cyynrvbx6zp3slsd82fykap6qvvwwn7xj8"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
(git (assoc-ref inputs "guile-git"))
(bytes (assoc-ref inputs "guile-bytestructures"))
(fibers (assoc-ref inputs "guile-fibers"))
+ (zlib (assoc-ref inputs "guile-zlib"))
(guix (assoc-ref inputs "guix"))
- (deps (list gcrypt json sqlite git bytes fibers guix))
+ (deps (list gcrypt json sqlite git bytes fibers
+ zlib guix))
(guile (assoc-ref %build-inputs "guile"))
(effective (read-line
(open-pipe* OPEN_READ
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
#t))))))
(inputs
- `(("guile" ,guile-2.2)
+ `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt)
- ("guile-json" ,guile-json-3)
+ ("guile-json" ,guile-json-4)
("guile-sqlite3" ,guile-sqlite3)
("guile-git" ,guile-git)
+ ("guile-zlib" ,guile-zlib)
;; 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)
intended as a replacement for Hydra.")
(home-page "https://www.gnu.org/software/guix/")
(license l:gpl3+))))
-
-(define-public gitlab-runner
- (package
- (name "gitlab-runner")
- (version "12.6.0")
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append
- "https://gitlab.com/gitlab-org/gitlab-runner/archive/v"
- version "/gitlab-runner-v" version ".tar.gz"))
- (sha256
- (base32 "1gb3mflz57niyyn4kj5l4m1g2sa2w4cn8gig5dfr04ns9w9kj8jr"))))
- (build-system go-build-system)
- (arguments '(#:import-path "gitlab.com/gitlab-org/gitlab-runner"))
- (home-page "https://docs.gitlab.com/runner/")
- (synopsis "GitLab Runner")
- (description "Gitlab Runner is used to run Gitlab's CI/CD jobs and send
-back the results to Gitlab instance. It is used in conjunction with Gitlab
-CI.")
- (license l:expat)))