From 0f01493dc893e43858953a37bc4859b323264524 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 15 Jan 2021 17:10:41 +0100 Subject: service: cuirass: Update it. --- gnu/packages/ci.scm | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 161b45846e..dad2e4e00c 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Mathieu Lirzin -;;; Copyright © 2017, 2020 Mathieu Othacehe +;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur ;;; @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix git-download) + #:use-module (guix download) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages docbook) @@ -68,8 +69,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "697fa14584551d9595cd042f1ffeba240e45a127") - (revision "56")) + (let ((commit "da6a5c0355e72d725003c9005a9974f2a476d999") + (revision "58")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -81,43 +82,33 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0gw9cja8fiyra9vnn3y384gwanvsqdq6gwjcvmz91sy5lvfwv34m")))) + "0p9ad0aisbl7clb3vi7zmfbnmnsnxq90vgx8v9ly5b0dgrav91p4")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) (ice-9 rdelim) (ice-9 popen)) - #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass - + #:tests? #f ;requires a PostgreSQL database. #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-repo-tests - (lambda _ - ;; Disable tests that use a connection to the Guix daemon. - (substitute* "Makefile.am" - (("tests/repo.scm \\\\") "\\")) - #t)) - (add-after 'disable-repo-tests 'patch-/bin/sh - (lambda _ - (substitute* "build-aux/git-version-gen" - (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. (let* ((out (assoc-ref outputs "out")) + (avahi (assoc-ref inputs "guile-avahi")) (gcrypt (assoc-ref inputs "guile-gcrypt")) (json (assoc-ref inputs "guile-json")) - (sqlite (assoc-ref inputs "guile-sqlite3")) + (zmq (assoc-ref inputs "guile-simple-zmq")) + (squee (assoc-ref inputs "guile-squee")) (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 - zlib guix)) + (deps (list avahi gcrypt json zmq squee git bytes + fibers zlib guix)) (guile (assoc-ref %build-inputs "guile")) (effective (read-line (open-pipe* OPEN_READ @@ -137,17 +128,22 @@ 1))) ;; Make sure 'cuirass' can find the 'evaluate' command, as ;; well as the relevant Guile modules. - (wrap-program (string-append out "/bin/cuirass") - `("PATH" ":" prefix (,(string-append out "/bin"))) - `("GUILE_LOAD_PATH" ":" prefix (,mods)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) + (for-each + (lambda (name) + (wrap-program (string-append out "/bin/" name) + `("PATH" ":" prefix (,(string-append out "/bin"))) + `("GUILE_LOAD_PATH" ":" prefix (,mods)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))) + '("cuirass" "remote-server" "remote-worker")) #t)))))) (inputs `(("guile" ,guile-3.0/libgc-7) + ("guile-avahi" ,guile-avahi) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) - ("guile-sqlite3" ,guile-sqlite3-dev) + ("guile-simple-zmq" ,guile-simple-zmq) + ("guile-squee" ,guile-squee) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) ;; FIXME: this is propagated by "guile-git", but it needs to be among -- cgit v1.2.3 From c13bd9bec84ce43c1e4aac415759537f16e822fa Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 28 Jan 2021 16:19:53 +0100 Subject: gnu: cuirass: Update to 0.0.1-59.68532ae. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-59.68532ae. Signed-off-by: Mathieu Othacehe --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index dad2e4e00c..508544c975 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -69,8 +69,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "da6a5c0355e72d725003c9005a9974f2a476d999") - (revision "58")) + (let ((commit "68532aee908954887bfd6393009485d5bbb94ea2") + (revision "59")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -82,7 +82,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0p9ad0aisbl7clb3vi7zmfbnmnsnxq90vgx8v9ly5b0dgrav91p4")))) + "0p6d04xnw6djp8wfr6wh6jx2v3nh9pcw57bgbvv6rk26xy6q69nf")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 96c183bf65e149ecafa1ddf6c2bea4e4167bc6d5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 28 Jan 2021 16:20:43 +0100 Subject: gnu: guile-sqlite3-dev: Remove it. * gnu/packages/ci.scm (guile-sqlite3-dev): Remove it. Signed-off-by: Mathieu Othacehe --- gnu/packages/ci.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 508544c975..b32514ce20 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -40,7 +40,6 @@ #: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) @@ -48,26 +47,6 @@ #: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 "68532aee908954887bfd6393009485d5bbb94ea2") (revision "59")) -- cgit v1.2.3 From 495bd7053c3ea88d7ba60c41891dd36607f6cc00 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 30 Jan 2021 14:27:51 +0100 Subject: gnu: cuirass: Update to 0.0.1-60.1e8d075. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-60.1e8d075. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index b32514ce20..6b04d19a6f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "68532aee908954887bfd6393009485d5bbb94ea2") - (revision "59")) + (let ((commit "1e8d075d706adb192eeb07302542448b4341fdf0") + (revision "60")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0p6d04xnw6djp8wfr6wh6jx2v3nh9pcw57bgbvv6rk26xy6q69nf")))) + "0nwrdj253wdqdrq83iv8i9prqzs9nncm8j6ncvd7ssscw7v1qjsa")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From f4a32c5d6b9272f989d847a04d3f732d79a48f70 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 30 Jan 2021 16:16:41 +0100 Subject: gnu: cuirass: Update to 0.0.1-61.6838ec2. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-61.6838ec2. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 6b04d19a6f..cae437cb8d 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "1e8d075d706adb192eeb07302542448b4341fdf0") - (revision "60")) + (let ((commit "6838ec2eac8eae2c3743fca76ad0cda87b4df5fb") + (revision "61")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0nwrdj253wdqdrq83iv8i9prqzs9nncm8j6ncvd7ssscw7v1qjsa")))) + "1jf5d9aar1s96ik7csxg448hzlbz12bkgxqkf4r025f6gp4migqc")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From bd139ecda214878d0a11f5d6a47ca35e248b6f67 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Feb 2021 11:51:53 +0100 Subject: gnu: cuirass: Update to 0.0.1-62.74c1a94. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-62.74c1a94. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index cae437cb8d..c4e85cea33 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "6838ec2eac8eae2c3743fca76ad0cda87b4df5fb") - (revision "61")) + (let ((commit "74c1a94a4db41ae1bebc4fe7dd7e2f550eb7e46f") + (revision "62")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1jf5d9aar1s96ik7csxg448hzlbz12bkgxqkf4r025f6gp4migqc")))) + "1lfng3w0sd28c06vbpf0vy50dbfvh36628z5c5sp8sdj4g7kvrrz")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 221fddd2e2495b1405daf1b34e9f52d6ad19cbbf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Feb 2021 12:07:21 +0100 Subject: gnu: cuirass: Update to 0.0.1-63.da93cb9. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-63.da93cb9. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c4e85cea33..a4ee9eae46 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "74c1a94a4db41ae1bebc4fe7dd7e2f550eb7e46f") - (revision "62")) + (let ((commit "da93cb96ff453d060bd185e31802ea58c5e8d7f0") + (revision "63")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1lfng3w0sd28c06vbpf0vy50dbfvh36628z5c5sp8sdj4g7kvrrz")))) + "0awygc2xwm1g90njydxfhk5laqjvah5s0a94zaa8w5iw2zrnbgyl")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 85843123dedc3060a128457f7814d7461cccb412 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 1 Feb 2021 18:20:04 +0100 Subject: gnu: cuirass: Update to 0.0.1-64.79b77b4. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-64.79b77b4. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index a4ee9eae46..9a08ac4c23 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "da93cb96ff453d060bd185e31802ea58c5e8d7f0") - (revision "63")) + (let ((commit "79b77b4377db2e79a1f3396cfeeca64bfab00341") + (revision "64")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0awygc2xwm1g90njydxfhk5laqjvah5s0a94zaa8w5iw2zrnbgyl")))) + "0wrpzhcs1cvc5c4s72zs100iw0f4nnv5j2lp6yz3j31zl92vxbis")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 3e82cd8bfc146d62cd1192a5d8903eb068aa6d0c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 2 Feb 2021 14:15:50 +0100 Subject: gnu: cuirass: Update to 0.0.1-65.6bd940f. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-65.6bd940f. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 9a08ac4c23..fe2ef7bb83 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "79b77b4377db2e79a1f3396cfeeca64bfab00341") - (revision "64")) + (let ((commit "6bd940fc24646533ed2c113d9b551d23fe4f030d") + (revision "65")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0wrpzhcs1cvc5c4s72zs100iw0f4nnv5j2lp6yz3j31zl92vxbis")))) + "0nv8y6dm17m4z28aqr47ch4l4qaqr1zixdv7jajxdky9dqy085vm")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3