;;; 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 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>
;;;
;;; This file is part of GNU Guix.
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml)
#:use-module (guix build-system gnu))
+;; Guile-Sqlite3 package adding SQL query logging support.
+;; Remove it when next Guile-Sqlite3 release is out.
+(define-public guile-sqlite3-dev
+ (let ((commit "22ef45d268de7707cbbb943c404f9b0c1668e2e1")
+ (revision "1"))
+ (package
+ (inherit guile-sqlite3)
+ (name "guile-sqlite3")
+ (version (git-version "0.1.2" revision commit))
+ (home-page "https://notabug.org/mothacehe/guile-sqlite3.git")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (sha256
+ (base32
+ "1q90f8zhw9n1c39szd2ba7aj5fi92m09pnlv0z7jbhnnjam5jwcd"))
+ (file-name (string-append name "-" version "-checkout")))))))
+
(define-public cuirass
- (let ((commit "d27ff21e430cd38b02bd70a0dc8d60c9c2736f83")
- (revision "24"))
+ (let ((commit "38ee2c5b5b21404f383fc5066af8141785676e56")
+ (revision "52"))
(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
- "166xl9zfy7dm645fk2ln45bvw0y0gy0xw8fb7mprbjz8v95dh27p"))))
+ "13z862i668v2c6w3ajb1mddkzfcdc16myjqz7gss59bykzag728p"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
(ice-9 rdelim)
(ice-9 popen))
+ #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
+
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-repo-tests
(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" ,guile-3.0/libgc-7)
("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt)
- ("guile-json" ,guile-json-3)
- ("guile-sqlite3" ,guile-sqlite3)
+ ("guile-json" ,guile-json-4)
+ ("guile-sqlite3" ,guile-sqlite3-dev)
("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)