From patchwork Thu Mar 25 15:26:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 28107 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CE5ED27BC5D; Thu, 25 Mar 2021 15:27:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0A62827BC5C for ; Thu, 25 Mar 2021 15:27:17 +0000 (GMT) Received: from localhost ([::1]:54820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPRtE-0002Q1-6b for patchwork@mira.cbaines.net; Thu, 25 Mar 2021 11:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPRt0-0002MQ-J6 for guix-patches@gnu.org; Thu, 25 Mar 2021 11:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPRsz-0001O6-QK for guix-patches@gnu.org; Thu, 25 Mar 2021 11:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lPRsz-0002cZ-MT for guix-patches@gnu.org; Thu, 25 Mar 2021 11:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47392] [PATCH 1/2] gnu: Add laminar. References: <87v99f9s15.fsf@cbaines.net> In-Reply-To: <87v99f9s15.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Mar 2021 15:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47392@debbugs.gnu.org Received: via spool by 47392-submit@debbugs.gnu.org id=B47392.161668597910002 (code B ref 47392); Thu, 25 Mar 2021 15:27:01 +0000 Received: (at 47392) by debbugs.gnu.org; 25 Mar 2021 15:26:19 +0000 Received: from localhost ([127.0.0.1]:39268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPRsF-0002b8-MN for submit@debbugs.gnu.org; Thu, 25 Mar 2021 11:26:19 -0400 Received: from mira.cbaines.net ([212.71.252.8]:44022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPRsD-0002ar-VI for 47392@debbugs.gnu.org; Thu, 25 Mar 2021 11:26:14 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id F179327BC5C for <47392@debbugs.gnu.org>; Thu, 25 Mar 2021 15:26:12 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e59d93a6 for <47392@debbugs.gnu.org>; Thu, 25 Mar 2021 15:26:12 +0000 (UTC) From: Christopher Baines Date: Thu, 25 Mar 2021 15:26:11 +0000 Message-Id: <20210325152612.15321-1-mail@cbaines.net> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ci.scm (laminar): New variable. --- gnu/packages/ci.scm | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index bafe997c82..4e13d01715 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -25,10 +25,13 @@ #: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) @@ -40,11 +43,14 @@ #: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 cuirass @@ -170,3 +176,101 @@ intended as a replacement for Hydra.") (home-page "https://www.gnu.org/software/guix/") (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) + (mkdir-p "../build/js") + (for-each (lambda (file) + (copy-file + file + (string-append + "../build/js/" (strip-store-file-name file)))) + (map (lambda (input) + (assoc-ref inputs input)) + '("vue.min.js" + "vue-router.min.js" + "ansi_up.js" + "Chart.min.js"))) + #t))))) + (inputs + `(("capnproto" ,capnproto) + ("rapidjson" ,rapidjson) + ("sqlite" ,sqlite) + ("boost" ,boost) + ("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest) + + ("vue.min.js" + ,(origin (method url-fetch) + (uri (string-append "https://cdnjs.cloudflare.com/ajax/libs/" + "vue/2.6.12/vue.min.js")) + (sha256 + (base32 + "01zklp5cyik65dfn64m8h2y2dxzgbyzgmbf99y7fwgnf0155r7pq")))) + ("vue-router.min.js" + ,(origin (method url-fetch) + (uri (string-append "https://cdnjs.cloudflare.com/ajax/libs/" + "vue-router/3.4.8/vue-router.min.js")) + (sha256 + (base32 + "07gx7znb30rk1z7w6ca7dlfjp44q12bbq6jghwfm27mf6psa80as")))) + ("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.min.js" + ,(origin (method url-fetch) + (uri (string-append "https://cdnjs.cloudflare.com/ajax/libs/" + "Chart.js/2.7.2/Chart.min.js")) + (sha256 + (base32 + "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9")))))) + (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 GNU/Linux tools such as bash and cron +instead of reinventing them.") + (home-page "https://laminar.ohwg.net/") + (license l:gpl3+)))