#: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 (guix download)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages check)
#:use-module (gnu packages docbook)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages mail)
#:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages serialization)
+ #: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 web)
#:use-module (gnu packages xml)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu))
-(define-public guile-mastodon-dev
- (let ((commit "88115d85221876b1baea4accb7c76995da32f479")
- (revision "1"))
+(define-public guile-squee-dev
+ (let ((commit "e0614273ad4067af82f508db51c8a100131151ea")
+ (revision "3"))
(package
- (inherit guile-mastodon)
- (name "guile-mastodon")
- (version (git-version "0.0.1" revision commit))
- (home-page "https://framagit.org/mothacehe/guile-mastodon.git")
+ (inherit guile-squee)
+ (name "guile-squee")
+ (version (string-append "0-" revision "." (string-take commit 7)))
+ (home-page "https://notabug.org/mothacehe/guile-squee.git")
(source (origin
(method git-fetch)
(uri (git-reference
(commit commit)))
(sha256
(base32
- "04dgxliz9bmhn0f7h1n0dj0r5h0fzhg80nxl1rpbxh4zs1yw9qvj"))
+ "1jps14z8653ah2kr367iayzyi3ql2s55l77xrafz7gk3mzcvgrrg"))
(file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass
- (let ((commit "14e1335732271fdce730cb7e5043429ea9155201")
- (revision "73"))
+ (let ((commit "60190401ce4ccc890629ec3cb22a84a8ab8c2645")
+ (revision "4"))
(package
(name "cuirass")
- (version (git-version "0.0.1" revision commit))
+ (version (git-version "1.1.0" revision commit))
(source
(origin
(method git-fetch)
(file-name (git-file-name name version))
(sha256
(base32
- "1xv2c4x1zbsf7ifwkmf1fjbbgbbdv33d8qx6b6iw9nnfr2022fqa"))))
+ "0b0bs32lzk5ck7lw8ac9dj2h70sqc5y430vhi7rcnwj48mdrchma"))))
(build-system gnu-build-system)
(arguments
- '(#:modules ((guix build utils)
+ `(#:modules ((guix build utils)
(guix build gnu-build-system)
(ice-9 rdelim)
(ice-9 popen))
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
+ ;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable them
+ ;; on that architecture for now.
+ #:tests? ,(let ((s (or (%current-target-system)
+ (%current-system))))
+ (not (string-prefix? "aarch64" s)))
+ #:parallel-tests? #f
#:phases
(modify-phases %standard-phases
+ (add-before 'bootstrap 'fix-version-gen
+ (lambda _
+ (patch-shebang "build-aux/git-version-gen")
+
+ (call-with-output-file ".tarball-version"
+ (lambda (port)
+ (display ,version port)))))
(add-before 'check 'set-PATH-for-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((pg (assoc-ref inputs "ephemeralpg"))
(path (getenv "PATH")))
(setenv "PATH" (string-append pg "/bin:" path))
#t)))
+ ;; Disable the remote tests that require a Guix daemon connection.
+ (add-before 'check 'disable-remote-tests
+ (lambda _
+ (substitute* "Makefile.am"
+ (("tests/remote.scm") ""))
+ #t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules.
(guix (assoc-ref inputs "guix"))
(deps (list avahi gcrypt json zmq squee git bytes
fibers zlib matd tls mail guix))
- (guile (assoc-ref %build-inputs "guile"))
+ (guile (assoc-ref inputs "guile"))
(effective
(read-line
(open-pipe* OPEN_READ
"/site-ccache:")
'suffix)
1)))
- ;; Make sure 'cuirass' can find the 'evaluate' command, as
- ;; well as the relevant Guile modules.
- (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"))
+ ;; Make sure 'cuirass' can find 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)))
#t))))))
(inputs
- `(("guile" ,guile-3.0/libgc-7)
+ `(("guile" ,guile-3.0-latest)
("guile-avahi" ,guile-avahi)
("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4)
("guile-simple-zmq" ,guile-simple-zmq)
- ("guile-squee" ,guile-squee)
+ ("guile-squee" ,guile-squee-dev)
("guile-git" ,guile-git)
("guile-zlib" ,guile-zlib)
- ("guile-mastodon" ,guile-mastodon-dev)
+ ("guile-mastodon" ,guile-mastodon)
("gnutls" ,gnutls)
("mailutils" ,mailutils)
;; FIXME: this is propagated by "guile-git", but it needs to be among
(description
"Cuirass is a continuous integration tool using GNU Guix. It is
intended as a replacement for Hydra.")
- (home-page "https://www.gnu.org/software/guix/")
+ (home-page "https://guix.gnu.org/cuirass/")
(license l:gpl3+))))
+
+(define-public laminar
+ (package
+ (name "laminar")
+ (version "1.0")
+ (source
+ (origin (method url-fetch)
+ (uri (string-append "https://github.com/ohwgiles/laminar/archive/"
+ version
+ ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ; TODO Can't build tests
+ #:configure-flags
+ (list "-DCMAKE_CXX_STANDARD=17"
+ ;; "-DBUILD_TESTS=true" TODO: objcopy: js/stPskyUS: can't add
+ ;; section '.note.GNU-stack': file format not recognized
+ (string-append "-DLAMINAR_VERSION=" ,version))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-CMakeLists.txt
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("file\\(DOWNLOAD.*\n$")
+ "# file download removed by Guix --")
+ (("install\\(FILES etc/laminar.service DESTINATION \\$\\{SYSTEMD\\_UNITDIR\\}\\)")
+ "")
+ (("install\\(FILES \\$\\{CMAKE\\_CURRENT\\_BINARY\\_DIR\\}\\/laminar\\.service DESTINATION \\$\\{SYSTEMD\\_UNITDIR\\}\\)")
+ "")
+ (("install\\(FILES etc/laminar\\.conf DESTINATION \\/etc\\)") "")
+ (("\\/usr\\/") ""))
+ #t))
+ (add-after 'configure 'copy-in-javascript-and-css
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (use-modules (ice-9 popen))
+
+ (mkdir-p "../build/js")
+ (for-each (lambda (name)
+ (let* ((file
+ (assoc-ref inputs (string-append name ".js")))
+ (port
+ (open-pipe* OPEN_READ "uglify-js" file))
+ (destination
+ (string-append
+ "../build/js/" name ".min.js")))
+
+ (call-with-output-file destination
+ (lambda (output-port)
+ (dump-port port output-port)))
+
+ (let ((exit (close-pipe port)))
+ (unless (zero? exit)
+ (error "uglify-js failed" exit)))))
+
+ '("vue"
+ "vue-router"
+ "Chart"))
+
+ ;; ansi_up.js isn't minified
+ (copy-file (assoc-ref inputs "ansi_up.js")
+ "../build/js/ansi_up.js")
+
+ #t)))))
+ (inputs
+ `(("capnproto" ,capnproto)
+ ("rapidjson" ,rapidjson)
+ ("sqlite" ,sqlite)
+ ("boost" ,boost)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("googletest" ,googletest)
+ ("uglify-js" ,uglify-js)
+
+ ("vue.js"
+ ,(origin (method url-fetch)
+ (uri (string-append "https://raw.githubusercontent.com/"
+ "vuejs/vue/v2.6.12/dist/vue.js"))
+ (sha256
+ (base32
+ "1mq2dn6yqbmzar77xf4x2bvvanf9xc9nwfq06sksl5zmr300m7qm"))))
+ ("vue-router.js"
+ ,(origin (method url-fetch)
+ (uri (string-append "https://raw.githubusercontent.com/"
+ "vuejs/vue-router/v3.4.8/dist/vue-router.js"))
+ (sha256
+ (base32
+ "1hkrbgzhpnrsb4zdafslqagy1vkac6bkdj7kh49js2lhkp9z4nj5"))))
+ ("ansi_up.js"
+ ,(origin (method url-fetch)
+ (uri (string-append "https://raw.githubusercontent.com/"
+ "drudru/ansi_up/v1.3.0/ansi_up.js"))
+ (sha256
+ (base32
+ "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"))))
+ ("Chart.js"
+ ,(origin (method url-fetch)
+ (uri (string-append "https://github.com/chartjs/Chart.js/"
+ "releases/download/v2.7.2/Chart.js"))
+ (sha256
+ (base32
+ "05m3gk6hqjx92j20drnk7q075qpjraywqaf25lnglmsgsgpiqsr7"))))))
+ (synopsis "Lightweight continuous integration service")
+ (description
+ "Laminar is a lightweight and modular continuous integration service. It
+doesn't have a configuration web UI instead uses version-controllable
+configuration files and scripts.
+
+Laminar encourages the use of existing tools such as bash and cron instead of
+reinventing them.")
+ (home-page "https://laminar.ohwg.net/")
+ (license l:gpl3+)))
HCoop / jackhill / guix / guix.git / blobdiff