From f7a4c002d5ee25baca0bb7402ed87d1d7518ff28 Mon Sep 17 00:00:00 2001 From: nik gaffney Date: Wed, 17 Jan 2024 14:20:15 +0100 Subject: [PATCH] Put in earplugs --- channel/zzkt/notes.org | 76 +++++++++++++++++++ .../zzkt/packages}/fonts-osp.scm | 2 +- .../zzkt/packages}/fonts-velvetyne.scm | 2 +- .../zzkt => channel/zzkt/packages}/fonts.scm | 2 +- .../zzkt/packages}/frameworkinfo.scm | 4 +- .../zzkt/packages}/plugdata.scm | 2 +- .../zzkt/packages}/sbcl-osc.scm | 2 +- .../zzkt/packages}/scribus.scm | 2 +- .../zzkt/packages}/soupault.scm | 2 +- .../zzkt => channel/zzkt/packages}/tidal.scm | 2 +- .../zzkt/services/grafana.scm | 52 ++++++------- .../zzkt/services/prometheus.scm | 50 ++++++------ 12 files changed, 137 insertions(+), 61 deletions(-) create mode 100644 channel/zzkt/notes.org rename {packages/zzkt => channel/zzkt/packages}/fonts-osp.scm (99%) rename {packages/zzkt => channel/zzkt/packages}/fonts-velvetyne.scm (99%) rename {packages/zzkt => channel/zzkt/packages}/fonts.scm (99%) rename {packages/zzkt => channel/zzkt/packages}/frameworkinfo.scm (96%) rename {packages/zzkt => channel/zzkt/packages}/plugdata.scm (97%) rename {packages/zzkt => channel/zzkt/packages}/sbcl-osc.scm (98%) rename {packages/zzkt => channel/zzkt/packages}/scribus.scm (99%) rename {packages/zzkt => channel/zzkt/packages}/soupault.scm (99%) rename {packages/zzkt => channel/zzkt/packages}/tidal.scm (99%) rename {packages => channel}/zzkt/services/grafana.scm (82%) rename {packages => channel}/zzkt/services/prometheus.scm (72%) diff --git a/channel/zzkt/notes.org b/channel/zzkt/notes.org new file mode 100644 index 0000000..41230fd --- /dev/null +++ b/channel/zzkt/notes.org @@ -0,0 +1,76 @@ +# -*- mode: org; coding: utf-8; -*- +#+LaTeX_CLASS: zzkt-article +#+LateX_Header: \setcounter{secnumdepth}{0} +#+OPTIONS: toc:2 num:nil html-style:nil +#+author: +#+title: packaging notes & sundry + +* soupault install via opam + +#+BEGIN_SRC text +; [zxxcxxz] eval $(opam env --switch=default) +; [zxxcxxz] opam install soupault=4.6.0 +[NOTE] External dependency handling not supported for OS family 'guix'. + You can disable this check using 'opam option --global depext=false' +The following actions will be performed: + - install ocamlbuild 0.14.3 [required by logs] + - install ocamlfind 1.9.6 [required by logs] + - install seq base [required by fileutils, spelll] + - install dune 3.12.2 [required by soupault] + - install uchar 0.0.2 [required by markup] + - install topkg 1.0.7 [required by logs] + - install tsort 2.1.0 [required by soupault] + - install stdlib-shims 0.3.0 [required by fileutils, spelll] + - install sexplib0 v0.16.0 [required by ezjsonm] + - install result 1.5 [required by ppx_deriving] + - install re 1.11.0 [required by soupault] + - install ppx_derivers 1.2.1 [required by ppx_deriving] + - install pp 1.2.0 [required by dune-private-libs] + - install ordering 3.12.2 [required by dyn, stdune] + - install ocaml-compiler-libs v0.12.4 [required by ppxlib] + - install menhirSdk 20231231 [required by menhir] + - install menhirLib 20231231 [required by otoml] + - install menhirCST 20231231 [required by menhir] + - install lua-ml 0.9.4 [required by soupault] + - install either 1.0.0 [required by containers] + - install csexp 1.5.2 [required by dune-configurator] + - install cppo 1.6.9 [required by ppx_deriving] + - install camlp-streams 5.0.1 [required by camomile, lambdasoup] + - install bigarray-compat 1.1.0 [required by ctypes] + - install base64 3.5.1 [required by soupault] + - install uutf 1.0.3 [required by jingoo, ezjsonm, otoml] + - install uucp 15.1.0 [required by jingoo] + - install rresult 0.7.0 [required by bos] + - install fmt 0.9.0 [required by soupault] + - install astring 0.8.5 [required by bos] + - install spelll 0.4 [required by soupault] + - install integers 0.7.0 [required by ctypes] + - install fileutils 0.6.4 [required by soupault] + - install dyn 3.12.2 [required by dune-private-libs] + - install ppxlib 0.31.0 [required by ppx_deriving] + - install menhir 20231231 [required by odate, jingoo, otoml] + - install dune-configurator 3.12.2 [required by containers, yaml] + - install markup 1.0.3 [required by soupault] + - install jsonm 1.0.2 [required by ezjsonm] + - install logs 0.7.0 [required by soupault] + - install cstruct 6.2.0 [required by eqaf, hex] + - install fpath 0.7.3 [required by bos] + - install stdune 3.12.2 [required by dune-private-libs] + - install ppx_deriving 5.2.1 [required by jingoo] + - install otoml 1.0.4 [required by soupault] + - install odate 0.7 [required by soupault] + - install ctypes 0.21.1 [required by yaml] + - install containers 3.13.1 [required by soupault] + - install lambdasoup 1.0.0 [required by soupault] + - install hex 1.5.0 [required by ezjsonm] + - install eqaf 0.9 [required by digestif] + - install bos 0.2.1 [required by yaml] + - install dune-private-libs 3.12.2 [required by dune-site] + - install jingoo 1.5.0 [required by soupault] + - install ezjsonm 1.3.0 [required by soupault] + - install digestif 1.1.4 [required by soupault] + - install yaml 3.2.0 [required by soupault] + - install dune-site 3.12.2 [required by camomile] + - install camomile 2.0.0 [required by soupault] + - install soupault 4.6.0 +#+END_SRC diff --git a/packages/zzkt/fonts-osp.scm b/channel/zzkt/packages/fonts-osp.scm similarity index 99% rename from packages/zzkt/fonts-osp.scm rename to channel/zzkt/packages/fonts-osp.scm index 26ab811..1dd7b44 100644 --- a/packages/zzkt/fonts-osp.scm +++ b/channel/zzkt/packages/fonts-osp.scm @@ -18,7 +18,7 @@ ;; as seen near gnu/packages/fonts.scm -(define-module (zzkt fonts-osp) +(define-module (zzkt packages fonts-osp) #:use-module (ice-9 regex) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) diff --git a/packages/zzkt/fonts-velvetyne.scm b/channel/zzkt/packages/fonts-velvetyne.scm similarity index 99% rename from packages/zzkt/fonts-velvetyne.scm rename to channel/zzkt/packages/fonts-velvetyne.scm index 44e3ccb..1b174fc 100644 --- a/packages/zzkt/fonts-velvetyne.scm +++ b/channel/zzkt/packages/fonts-velvetyne.scm @@ -18,7 +18,7 @@ ;; as seen near gnu/packages/fonts.scm -(define-module (zzkt fonts-velvetyne) +(define-module (zzkt packages fonts-velvetyne) #:use-module (ice-9 regex) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) diff --git a/packages/zzkt/fonts.scm b/channel/zzkt/packages/fonts.scm similarity index 99% rename from packages/zzkt/fonts.scm rename to channel/zzkt/packages/fonts.scm index f71de09..486b1ef 100644 --- a/packages/zzkt/fonts.scm +++ b/channel/zzkt/packages/fonts.scm @@ -17,7 +17,7 @@ ;; as seen near gnu/packages/fonts.scm -(define-module (zzkt fonts) +(define-module (zzkt packages fonts) #:use-module (ice-9 regex) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) diff --git a/packages/zzkt/frameworkinfo.scm b/channel/zzkt/packages/frameworkinfo.scm similarity index 96% rename from packages/zzkt/frameworkinfo.scm rename to channel/zzkt/packages/frameworkinfo.scm index 0c3bafb..63ddf07 100644 --- a/packages/zzkt/frameworkinfo.scm +++ b/channel/zzkt/packages/frameworkinfo.scm @@ -16,7 +16,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (zzkt frameworkinfo) +(define-module (zzkt packages frameworkinfo) #:use-module (guix) #:use-module (guix build-system python) #:use-module (guix git-download) @@ -31,7 +31,7 @@ (define-public frameworkinfo (package (name "frameworkinfo") - (version "0.2") + (version "0.3") (source (origin (method git-fetch) diff --git a/packages/zzkt/plugdata.scm b/channel/zzkt/packages/plugdata.scm similarity index 97% rename from packages/zzkt/plugdata.scm rename to channel/zzkt/packages/plugdata.scm index 682a86b..2db385b 100644 --- a/packages/zzkt/plugdata.scm +++ b/channel/zzkt/packages/plugdata.scm @@ -16,7 +16,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (zzkt plugdata) +(define-module (zzkt packages plugdata) #:use-module (guix) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) diff --git a/packages/zzkt/sbcl-osc.scm b/channel/zzkt/packages/sbcl-osc.scm similarity index 98% rename from packages/zzkt/sbcl-osc.scm rename to channel/zzkt/packages/sbcl-osc.scm index ebb41fe..e8dd176 100644 --- a/packages/zzkt/sbcl-osc.scm +++ b/channel/zzkt/packages/sbcl-osc.scm @@ -16,7 +16,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (zzkt sbcl-osc) +(define-module (zzkt packages sbcl-osc) #:use-module (guix) #:use-module (guix build-system asdf) #:use-module (gnu packages lisp-xyz) diff --git a/packages/zzkt/scribus.scm b/channel/zzkt/packages/scribus.scm similarity index 99% rename from packages/zzkt/scribus.scm rename to channel/zzkt/packages/scribus.scm index c269634..20a3518 100644 --- a/packages/zzkt/scribus.scm +++ b/channel/zzkt/packages/scribus.scm @@ -23,7 +23,7 @@ ;; via https://issues.guix.gnu.org/68203 -(define-module (zzkt scribus) +(define-module (zzkt packages scribus) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) diff --git a/packages/zzkt/soupault.scm b/channel/zzkt/packages/soupault.scm similarity index 99% rename from packages/zzkt/soupault.scm rename to channel/zzkt/packages/soupault.scm index 8acfc3e..a402cb6 100644 --- a/packages/zzkt/soupault.scm +++ b/channel/zzkt/packages/soupault.scm @@ -19,7 +19,7 @@ ;;; via unofficial channels ;;; https://repo.fo.am/zzkt/guix -(define-module (zzkt soupault) +(define-module (zzkt packages soupault) #:use-module (guix) #:use-module (guix build-system dune) #:use-module (guix build-system ocaml) diff --git a/packages/zzkt/tidal.scm b/channel/zzkt/packages/tidal.scm similarity index 99% rename from packages/zzkt/tidal.scm rename to channel/zzkt/packages/tidal.scm index 6065b16..c9f7acf 100644 --- a/packages/zzkt/tidal.scm +++ b/channel/zzkt/packages/tidal.scm @@ -22,7 +22,7 @@ ;; - supercollider ;; - https://github.com/musikinformatik/SuperDirt -(define-module (zzkt tidal) +(define-module (zzkt packages tidal) #:use-module (guix) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) diff --git a/packages/zzkt/services/grafana.scm b/channel/zzkt/services/grafana.scm similarity index 82% rename from packages/zzkt/services/grafana.scm rename to channel/zzkt/services/grafana.scm index d5723da..fec6641 100644 --- a/packages/zzkt/services/grafana.scm +++ b/channel/zzkt/services/grafana.scm @@ -14,16 +14,16 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 string-fun) - #:export (oci-grafana-service-type - oci-grafana-configuration - oci-grafana-configuration? - oci-grafana-configuration-fields - oci-grafana-configuration-datadir - oci-grafana-configuration-image - oci-grafana-configuration-port - oci-grafana-configuration-grafana.ini - oci-grafana-configuration-network - oci-grafana-configuration->oci-container-configuration + #:export (grafana-service-type + grafana-configuration + grafana-configuration? + grafana-configuration-fields + grafana-configuration-datadir + grafana-configuration-image + grafana-configuration-port + grafana-configuration-grafana.ini + grafana-configuration-network + grafana-configuration->container-configuration %grafana-accounts %grafana-activation @@ -137,7 +137,7 @@ "Everything you want to manually add to grafana.ini.") (prefix gf-)) -(define-configuration oci-grafana-configuration +(define-configuration grafana-configuration (datadir (string "/var/lib/grafana") "The directory where grafana writes state.") @@ -169,11 +169,11 @@ to \"host\" the @code{port} field will be ignored.") (define (%grafana-activation config) "Return an activation gexp for Grafana." - (let* ((datadir (oci-grafana-configuration-datadir config)) + (let* ((datadir (grafana-configuration-datadir config)) (grafana.ini (mixed-text-file "grafana.ini" - (serialize-configuration (oci-grafana-configuration-grafana.ini config) + (serialize-configuration (grafana-configuration-grafana.ini config) grafana-configuration-fields)))) #~(begin (use-modules (guix build utils)) @@ -189,19 +189,19 @@ to \"host\" the @code{port} field will be ignored.") '(("/etc/grafana/grafana.ini" #$grafana.ini))))))) -(define oci-grafana-configuration->oci-container-configuration +(define grafana-configuration->container-configuration (lambda (config) (let* ((datadir - (oci-grafana-configuration-datadir config)) - (grafana.ini (oci-grafana-configuration-grafana.ini config)) + (grafana-configuration-datadir config)) + (grafana.ini (grafana-configuration-grafana.ini config)) (network - (oci-grafana-configuration-network config)) + (grafana-configuration-network config)) (image - (oci-grafana-configuration-image config)) + (grafana-configuration-image config)) (port - (oci-grafana-configuration-port config)) + (grafana-configuration-port config)) (container-config - (oci-container-configuration + (container-configuration (image image) (ports `((,port . "3000"))) @@ -212,19 +212,19 @@ to \"host\" the @code{port} field will be ignored.") ("/etc/grafana/grafana.ini" . "/opt/bitnami/grafana/conf/grafana.ini")))))) (list (if (maybe-value-set? network) - (oci-container-configuration + (container-configuration (inherit container-config) (network network)) container-config))))) -(define oci-grafana-service-type +(define grafana-service-type (service-type (name 'grafana) - (extensions (list (service-extension oci-container-service-type - oci-grafana-configuration->oci-container-configuration) + (extensions (list (service-extension container-service-type + grafana-configuration->container-configuration) (service-extension account-service-type (const %grafana-accounts)) (service-extension activation-service-type %grafana-activation))) - (default-value (oci-grafana-configuration)) + (default-value (grafana-configuration)) (description - "This service install a OCI backed Grafana Shepherd Service."))) + "Grafana as Shepherd Service."))) diff --git a/packages/zzkt/services/prometheus.scm b/channel/zzkt/services/prometheus.scm similarity index 72% rename from packages/zzkt/services/prometheus.scm rename to channel/zzkt/services/prometheus.scm index 8b3fe7e..5631bf3 100644 --- a/packages/zzkt/services/prometheus.scm +++ b/channel/zzkt/services/prometheus.scm @@ -10,16 +10,16 @@ #:use-module (gnu services docker) #:use-module (gnu system shadow) #:use-module (guix gexp) - #:export (oci-prometheus-service-type - oci-prometheus-configuration - oci-prometheus-configuration? - oci-prometheus-configuration-fields - oci-prometheus-configuration-datadir - oci-prometheus-configuration-network - oci-prometheus-configuration-file - oci-prometheus-configuration-image - oci-prometheus-configuration-port - oci-prometheus-configuration->oci-container-configuration + #:export (prometheus-service-type + prometheus-configuration + prometheus-configuration? + prometheus-configuration-fields + prometheus-configuration-datadir + prometheus-configuration-network + prometheus-configuration-file + prometheus-configuration-image + prometheus-configuration-port + prometheus-configuration->container-configuration %prometheus-accounts %prometheus-activation)) @@ -43,7 +43,7 @@ scrape_configs: (define-maybe string) -(define-configuration oci-prometheus-configuration +(define-configuration prometheus-configuration (datadir (string "/var/lib/prometheus") "The directory where prometheus writes state.") @@ -84,7 +84,7 @@ port inside the container.") (define (%prometheus-activation config) "Return an activation gexp for Prometheus." - (let ((datadir (oci-prometheus-configuration-datadir config))) + (let ((datadir (prometheus-configuration-datadir config))) #~(begin (use-modules (guix build utils)) (let* ((user (getpwnam "prometheus")) @@ -94,22 +94,22 @@ port inside the container.") (mkdir-p datadir) (chown datadir uid gid))))) -(define oci-prometheus-configuration->oci-container-configuration +(define prometheus-configuration->container-configuration (lambda (config) (let* ((datadir - (oci-prometheus-configuration-datadir config)) + (prometheus-configuration-datadir config)) (network - (oci-prometheus-configuration-network config)) + (prometheus-configuration-network config)) (image - (oci-prometheus-configuration-image config)) + (prometheus-configuration-image config)) (port - (oci-prometheus-configuration-port config)) + (prometheus-configuration-port config)) (metrics-port - (oci-prometheus-configuration-metrics-port config)) + (prometheus-configuration-metrics-port config)) (prometheus.yml - (oci-prometheus-configuration-file config)) + (prometheus-configuration-file config)) (container-config - (oci-container-configuration + (container-configuration (command '("--web.enable-lifecycle" "--config.file=/etc/prometheus/prometheus.yml" @@ -124,20 +124,20 @@ port inside the container.") (list (if (maybe-value-set? network) - (oci-container-configuration + (container-configuration (inherit container-config) (network network)) container-config))))) -(define oci-prometheus-service-type +(define prometheus-service-type (service-type (name 'prometheus) - (extensions (list (service-extension oci-container-service-type - oci-prometheus-configuration->oci-container-configuration) + (extensions (list (service-extension container-service-type + prometheus-configuration->container-configuration) (service-extension account-service-type (const %prometheus-accounts)) (service-extension activation-service-type %prometheus-activation))) - (default-value (oci-prometheus-configuration)) + (default-value (prometheus-configuration)) (description "Prometheus as a Shepherd Service.")))