From 592b14483695decd45d0784ec14debd062b48664 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 14 Feb 2024 22:41:37 +0000 Subject: gnu: go-github-com-coreos-go-systemd-activation: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-activation): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/backup.scm: Add (gnu packages golang-xyz) module. Change-Id: I6bcc819e65347588103064a892f8c6c46288179a --- gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index f324624f48..5673324fc5 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Thomas Ieong +;;; Copyright © 2023 Timo Wilken ;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. @@ -207,6 +208,29 @@ (define-public go-github-com-burntsushi-toml similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) +(define-public go-github-com-coreos-go-systemd-activation + (package + (name "go-github-com-coreos-go-systemd-activation") + (version "0.0.0-20191104093116-d3cd4ed1dbcf") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coreos/go-systemd") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "193mgqn7n4gbb8jb5kyn6ml4lbvh4xs55qpjnisaz7j945ik3kd8")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/coreos/go-systemd/activation" + #:unpack-path "github.com/coreos/go-systemd")) + (home-page "https://github.com/coreos/go-systemd") + (synopsis "Go bindings to systemd socket activation") + (description "Go bindings to systemd socket activation; for writing and +using socket activation from Go.") + (license license:asl2.0))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") -- cgit v1.2.3 From 30afb17152462e180b92b06829ab85d0a2d337cf Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 17 Jan 2024 22:25:00 +0300 Subject: gnu: Add go-github-com-coreos-go-systemd-daemon. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-daemon): New variable. Change-Id: If79215d0676b9bb8dfe6e12a144a9b156f43f9be Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 5673324fc5..210d9d72fa 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -231,6 +231,18 @@ (define-public go-github-com-coreos-go-systemd-activation using socket activation from Go.") (license license:asl2.0))) +(define-public go-github-com-coreos-go-systemd-daemon + (package + (inherit go-github-com-coreos-go-systemd-activation) + (name "go-github-com-coreos-go-systemd-daemon") + (arguments + '(#:import-path "github.com/coreos/go-systemd/daemon" + #:unpack-path "github.com/coreos/go-systemd")) + (home-page "https://github.com/coreos/go-systemd") + (synopsis "Go bindings to systemd for notifications") + (description "Go bindings to systemd for notifying the daemon of service +status changes"))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") -- cgit v1.2.3 From cfeec48158d2a52ce4fc9d560075ffba1f3b6822 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 17 Jan 2024 22:34:12 +0300 Subject: gnu: Add go-github-com-coreos-go-systemd-dbus. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-dbus): New variable. Change-Id: Ib50ff86ec7c03fd8b5e732dc9b3ec5e4196d8d3b Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 210d9d72fa..c968b0018b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -243,6 +243,20 @@ (define-public go-github-com-coreos-go-systemd-daemon (description "Go bindings to systemd for notifying the daemon of service status changes"))) +(define-public go-github-com-coreos-go-systemd-dbus + (package + (inherit go-github-com-coreos-go-systemd-activation) + (name "go-github-com-coreos-go-systemd-dbus") + (arguments + '(#:tests? #f ;Tests require D-Bus daemon running. + #:import-path "github.com/coreos/go-systemd/dbus" + #:unpack-path "github.com/coreos/go-systemd")) + (native-inputs (list go-github-com-godbus-dbus)) + (home-page "https://github.com/coreos/go-systemd") + (synopsis "Go bindings to systemd for managing services") + (description "Go bindings to systemd for starting/stopping/inspecting +running services and units."))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") -- cgit v1.2.3 From ba17880abd18b59eaf41e04893ce019cb1724814 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 17 Jan 2024 22:38:38 +0300 Subject: gnu: Add go-github-com-coreos-go-systemd-journal. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-journal): New variable. Change-Id: I6a8ae9d416ce7c4236ce0d8a8388da130964144c Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index c968b0018b..2bb68ecb86 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -257,6 +257,19 @@ (define-public go-github-com-coreos-go-systemd-dbus (description "Go bindings to systemd for starting/stopping/inspecting running services and units."))) +(define-public go-github-com-coreos-go-systemd-journal + (package + (inherit go-github-com-coreos-go-systemd-activation) + (name "go-github-com-coreos-go-systemd-journal") + (arguments + '(#:tests? #f ;Tests require access to journald socket. + #:import-path "github.com/coreos/go-systemd/journal" + #:unpack-path "github.com/coreos/go-systemd")) + (home-page "https://github.com/coreos/go-systemd") + (synopsis "Go bindings to systemd for writing journald") + (description "Go bindings to systemd for writing to systemd's logging +service, journald."))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") -- cgit v1.2.3 From 40cc2ca588607f976f0adc094b91a886ef0044f6 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 17 Jan 2024 22:43:37 +0300 Subject: gnu: Add go-github-com-coreos-go-systemd-login1. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-login1): New variable. Change-Id: I815e67c119b00232a620004f72e6b61d90d2c06a Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 2bb68ecb86..909442a762 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -270,6 +270,20 @@ (define-public go-github-com-coreos-go-systemd-journal (description "Go bindings to systemd for writing to systemd's logging service, journald."))) +(define-public go-github-com-coreos-go-systemd-login1 + (package + (inherit go-github-com-coreos-go-systemd-activation) + (name "go-github-com-coreos-go-systemd-login1") + (arguments + '(#:tests? #f ;Tests require D-Bus daemon running. + #:import-path "github.com/coreos/go-systemd/login1" + #:unpack-path "github.com/coreos/go-systemd")) + (native-inputs (list go-github-com-godbus-dbus)) + (home-page "https://github.com/coreos/go-systemd") + (synopsis "Go bindings to systemd for integration with logind API") + (description "Go bindings to systemd for integration with the systemd +logind API."))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") -- cgit v1.2.3 From 51f8d606658bd3813dc0a395c5fa5bb937f35559 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 17 Jan 2024 22:46:31 +0300 Subject: gnu: Add go-github-com-coreos-go-systemd-machine1. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-machine1): New variable. Change-Id: I2d9340a2b70dd68e24e4a88bdcd1f4c289100c6d Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 909442a762..6b18d33ed1 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -284,6 +284,20 @@ (define-public go-github-com-coreos-go-systemd-login1 (description "Go bindings to systemd for integration with the systemd logind API."))) +(define-public go-github-com-coreos-go-systemd-machine1 + (package + (inherit go-github-com-coreos-go-systemd-activation) + (name "go-github-com-coreos-go-systemd-machine1") + (arguments + '(#:tests? #f ;Tests require D-Bus daemon running. + #:import-path "github.com/coreos/go-systemd/machine1" + #:unpack-path "github.com/coreos/go-systemd")) + (native-inputs (list go-github-com-godbus-dbus)) + (home-page "https://github.com/coreos/go-systemd") + (synopsis "Go bindings to systemd for registering machines/containers") + (description "Go bindings to systemd for registering +machines/containers."))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") -- cgit v1.2.3 From 3aa92cc71f24b8a35fc77aaafdf9870313a0504e Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 17 Jan 2024 22:48:36 +0300 Subject: gnu: Add go-github-com-coreos-go-systemd-unit. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-unit): New variable. Change-Id: I4103a0a8a3fe8f0efe4e21b053cecda9825efdc1 Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 6b18d33ed1..625abaf25b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -298,6 +298,20 @@ (define-public go-github-com-coreos-go-systemd-machine1 (description "Go bindings to systemd for registering machines/containers."))) +(define-public go-github-com-coreos-go-systemd-unit + (package + (inherit go-github-com-coreos-go-systemd-activation) + (name "go-github-com-coreos-go-systemd-unit") + (arguments + '(#:tests? #f ;Tests require D-Bus daemon running. + #:import-path "github.com/coreos/go-systemd/unit" + #:unpack-path "github.com/coreos/go-systemd")) + (native-inputs (list go-github-com-godbus-dbus)) + (home-page "https://github.com/coreos/go-systemd") + (synopsis "Go bindings to systemd for working with unit files") + (description "Go bindings to systemd for (de)serialization and comparison +of unit files."))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") -- cgit v1.2.3 From 9ddb59f45291d38bb385fc513ccb2ebcbbb0c1cb Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Mon, 29 Jan 2024 21:29:46 +0300 Subject: gnu: Add go-github-com-coreos-go-systemd-sdjournal. * gnu/packages/golang.scm (go-github-com-coreos-go-systemd-sdjournal): New variable. Change-Id: I48d6d6e888ab757363a16bae9f50c1ff955f287a Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 625abaf25b..41821af92b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -33,6 +33,7 @@ (define-module (gnu packages golang-xyz) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) @@ -298,6 +299,30 @@ (define-public go-github-com-coreos-go-systemd-machine1 (description "Go bindings to systemd for registering machines/containers."))) +(define-public go-github-com-coreos-go-systemd-sdjournal + (package + (inherit go-github-com-coreos-go-systemd-activation) + (name "go-github-com-coreos-go-systemd-sdjournal") + (arguments + '(#:tests? #f ;Tests require D-Bus daemon running. + #:import-path "github.com/coreos/go-systemd/sdjournal" + #:unpack-path "github.com/coreos/go-systemd" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-sdjournal-header + (lambda* (#:key import-path #:allow-other-keys) + (substitute* (format #f + "src/~a/journal.go" + import-path) + (("systemd/sd-journal.h") + "elogind/sd-journal.h") + (("systemd/sd-id128.h") + "elogind/sd-id128.h"))))))) + (inputs (list elogind)) + (synopsis "Go bindings to systemd for journald") + (description "Go bindings to systemd for reading from journald by wrapping +its C API."))) + (define-public go-github-com-coreos-go-systemd-unit (package (inherit go-github-com-coreos-go-systemd-activation) -- cgit v1.2.3 From 3e2334d9457c4bd9ccd9c720de2cf298f0c8f122 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 15 Feb 2024 21:20:32 +0000 Subject: gnu: go-github-com-mattn-go-shellwords: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-mattn-go-shellwords): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/terminals.scm: Add (gnu packages golang-xyz) module. Change-Id: Icedf167f4477c6a84fd1b897ca208d6e737efb48 --- gnu/packages/golang-xyz.scm | 34 +++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 30 ------------------------------ gnu/packages/terminals.scm | 1 + 3 files changed, 34 insertions(+), 31 deletions(-) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 41821af92b..50beb0dffe 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1,11 +1,13 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019 Leo Famulari ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2019 Brian Leung ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2023 Benjamin ;;; Copyright © 2023 Katherine Cox-Buday -;;; Copyright © 2023 Sharlatan Hellseher +;;; Copyright © 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2023 Timo Wilken ;;; Copyright © 2024 Artyom V. Poptsov @@ -470,6 +472,36 @@ (define-public go-github-com-matryer-try (description "This package provides an idiomatic Go retry module.") (license license:expat))) +(define-public go-github-com-mattn-go-shellwords + (package + (name "go-github-com-mattn-go-shellwords") + (version "1.0.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattn/go-shellwords") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l0l5s4hlsrm4z6hygig2pp1qirk5ycrzn9z27ay3yvg9k7zafzx")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/mattn/go-shellwords" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sh-path + (lambda* (#:key import-path #:allow-other-keys) + (substitute* (string-append + "src/" import-path "/util_posix.go") + (("/bin/sh") (which "sh")))))))) + (home-page "https://github.com/mattn/go-shellwords") + (synopsis "Parse lines into shell words") + (description "This package parses text into shell arguments. Based on +the @code{cpan} module @code{Parse::CommandLine}.") + (license license:expat))) + (define-public go-github-com-miekg-dns (package (name "go-github-com-miekg-dns") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f6dc0a4f45..7cc532d223 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6056,36 +6056,6 @@ (define-public go-github-com-xo-terminfo "The terminfo package implements terminfo database reading for Go.") (license license:expat))) -(define-public go-github-com-mattn-go-shellwords - (package - (name "go-github-com-mattn-go-shellwords") - (version "1.0.12") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mattn/go-shellwords") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0l0l5s4hlsrm4z6hygig2pp1qirk5ycrzn9z27ay3yvg9k7zafzx")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/mattn/go-shellwords" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-sh-path - (lambda* (#:key import-path #:allow-other-keys) - (substitute* (string-append - "src/" import-path "/util_posix.go") - (("/bin/sh") (which "sh")))))))) - (home-page "https://github.com/mattn/go-shellwords") - (synopsis "Parse lines into shell words") - (description "This package parses text into shell arguments. Based on -the @code{cpan} module @code{Parse::CommandLine}.") - (license license:expat))) - (define-public go-github-com-burntsushi-locker (let ((commit "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a") (revision "0")) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f2af00cfa4..ef187c6ced 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -92,6 +92,7 @@ (define-module (gnu packages terminals) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libcanberra) -- cgit v1.2.3 From 8595b82d5536f4b18ce9a78142ee02fd7dd8fd4a Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 29 Jul 2023 01:19:47 +0800 Subject: gnu: Add go-github-com-a8m-envsubst. * gnu/packages/golang-xyz.scm (go-github-com-a8m-envsubst): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I356924d0eb4137425608d64d7ed16e1430b9be03 --- gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 50beb0dffe..5312198009 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2023 Benjamin +;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2023 Thomas Ieong @@ -50,6 +51,29 @@ (define-module (gnu packages golang-xyz) ;;; ;;; Code: +(define-public go-github-com-a8m-envsubst + (package + (name "go-github-com-a8m-envsubst") + (version "1.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/a8m/envsubst") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mjs729g9nmalx25l4nn3p07amm4vsciqmdf0jbh2jwpy1zymz41")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/a8m/envsubst")) + (home-page "https://github.com/a8m/envsubst") + (synopsis "Environment variables substitution for Go") + (description + "This package provides a library for environment variables +substitution.") + (license license:expat))) + (define-public go-github-com-anmitsu-go-shlex (package (name "go-github-com-anmitsu-go-shlex") -- cgit v1.2.3 From b2ad18ce4d966ca7c12d7d9ca49556f5e88568b6 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 29 Jul 2023 01:19:51 +0800 Subject: gnu: Add go-github-com-alecthomas-participle-v2. * gnu/packages/golang-xyz.scm (go-github-com-alecthomas-participle-v2): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: Ia6a75894a65de756b771d2467125db411da2708b --- gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 5312198009..8df9481b0e 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -74,6 +74,34 @@ (define-public go-github-com-a8m-envsubst substitution.") (license license:expat))) +(define-public go-github-com-alecthomas-participle-v2 + (package + (name "go-github-com-alecthomas-participle-v2") + (version "2.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/participle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k2vsd58rgwyylyn5zja6z6k1sg4m39g2fhd88lvja60ca51bh98")))) + (build-system go-build-system) + (arguments + (list #:go go-1.18 + #:import-path "github.com/alecthomas/participle/v2")) + (native-inputs + (list go-github-com-alecthomas-assert-v2)) + (home-page "https://github.com/alecthomas/participle") + (synopsis "Parser library for Go") + (description + "This package provides a parser library for Golang which constructs +parsers from definitions in struct tags and parses directly into those +structs. The approach is similar to how other marshallers work in Golang, +\"unmarshalling\" an instance of a grammar into a struct.") + (license license:expat))) + (define-public go-github-com-anmitsu-go-shlex (package (name "go-github-com-anmitsu-go-shlex") -- cgit v1.2.3 From 701907fae9782e038cd949ed4d8c8d1581d58ac2 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 29 Jul 2023 01:19:52 +0800 Subject: gnu: Add go-github-com-dimchansky-utfbom. * gnu/packages/golang-xyz.scm (go-github-com-dimchansky-utfbom): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I25ecf3bd881d2317b84ecaef5260c78296f51d56 --- gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 8df9481b0e..cbb7c394d8 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -417,6 +417,29 @@ (define-public go-github-com-cyberdelia-go-metrics-graphite metrics to Graphite.") (license license:bsd-2))) +(define-public go-github-com-dimchansky-utfbom + (package + (name "go-github-com-dimchansky-utfbom") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dimchansky/utfbom") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ll3wqvifmdanfyg6wsvz31c7n4mnczg2yxb65j35qxrnak89hn3")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/dimchansky/utfbom")) + (home-page "https://github.com/dimchansky/utfbom") + (synopsis "Go Unicode byte order mark detection library") + (description + "This package provides a library for @acronym{BOM, Unicode Byte Order +Mark} detection.") + (license license:asl2.0))) + (define-public go-github-com-djherbis-atime (package (name "go-github-com-djherbis-atime") -- cgit v1.2.3 From 10ecec291eac4a7d762fbb527734e9bf5fa9be85 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 29 Jul 2023 01:19:53 +0800 Subject: gnu: Add go-github-com-elliotchance-orderedmap. * gnu/packages/golang-xyz.scm (go-github-com-elliotchance-orderedmap): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I44518a6a5371e5312b472aaa2c8d9a417d621924 --- gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index cbb7c394d8..d2e58001cf 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -462,6 +462,31 @@ (define-public go-github-com-djherbis-atime atimes for files.") (license license:expat))) +(define-public go-github-com-elliotchance-orderedmap + (package + (name "go-github-com-elliotchance-orderedmap") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elliotchance/orderedmap") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06gq5hsgfmzfr46wds366ghyn16qkygyz83vrsgargf4l7db9zg7")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/elliotchance/orderedmap")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/elliotchance/orderedmap") + (synopsis "Go ordered map library") + (description + "This package provides a ordered map library that maintains amortized O(1) +for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.") + (license license:expat))) + (define-public go-github-com-gabriel-vasile-mimetype (package (name "go-github-com-gabriel-vasile-mimetype") -- cgit v1.2.3 From 852d0eab39e7289eee708e138833d4e9596363c5 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 29 Jul 2023 01:20:03 +0800 Subject: gnu: Add go-github-com-jinzhu-copier. * gnu/packages/golang-xyz.scm (go-github-com-jinzhu-copier): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: Ibff15ec235790b915c852a0d9a33572a05f3374d --- gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index d2e58001cf..33d77e8507 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -538,6 +538,29 @@ (define-public go-github-com-gabriel-vasile-mimetype @end itemize") (license license:expat))) +(define-public go-github-com-jinzhu-copier + (package + (name "go-github-com-jinzhu-copier") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jinzhu/copier") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kf29cmmbic72kfrfd1xnass7l9j85impf8mqn5f3fd3ibi9bs74")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/jinzhu/copier")) + (home-page "https://github.com/jinzhu/copier") + (synopsis "Go copier library") + (description + "This package provides a library, which supports copying value from one +struct to another.") + (license license:expat))) + (define-public go-github-com-matryer-try (package (name "go-github-com-matryer-try") -- cgit v1.2.3 From 60d883db03d53dde53a24273f8524c04bcc04b3f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 15 Feb 2024 22:59:25 +0000 Subject: gnu: go-github-com-op-go-logging: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-op-go-logging): Move from here ... * gnu/packages/golang-xyz.scm: ... to here Change-Id: Ifd2e30b644c7727650eef1996e86b679c994cb35 --- gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 28 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 33d77e8507..f4ffd3b6eb 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2023 Benjamin @@ -832,6 +833,33 @@ (define-public go-github-com-nsqio-go-nsq NSQ protocol @url{https://nsq.io/}.") (license license:expat))) +(define-public go-github-com-op-go-logging + (package + (name "go-github-com-op-go-logging") + (version "1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/op/go-logging") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn")))) + (build-system go-build-system) + (arguments + `(#:tests? #f ; ERROR: incorrect callpath: String.rec...a.b.c.Info. + #:import-path "github.com/op/go-logging")) + (home-page "https://github.com/op/go-logging") + (synopsis "Go logging library") + (description + "Go-Logging implements a logging infrastructure for Go. Its +output format is customizable and supports different logging backends like +syslog, file and memory. Multiple backends can be utilized with different log +levels per backend and logger.") + (license license:bsd-3))) + (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") (revision "2")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7052472e14..527b63d160 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1984,32 +1984,6 @@ (define-public go-github-com-blanu-dust ;; Others. license:expat)))) -(define-public go-github-com-op-go-logging - (package - (name "go-github-com-op-go-logging") - (version "1") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/op/go-logging") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn")))) - (build-system go-build-system) - (arguments - `(#:tests? #f ; ERROR: incorrect callpath: String.rec...a.b.c.Info. - #:import-path "github.com/op/go-logging")) - (home-page "https://github.com/op/go-logging") - (synopsis "Go logging library") - (description "Go-Logging implements a logging infrastructure for Go. Its -output format is customizable and supports different logging backends like -syslog, file and memory. Multiple backends can be utilized with different log -levels per backend and logger.") - (license license:bsd-3))) - (define-public go-github-com-operatorfoundation-shapeshifter-ipc (package (name "go-github-com-operatorfoundation-shapeshifter-ipc") -- cgit v1.2.3 From 32aa57a3583b8ef7f355ea984ffcc0c63bf9d6b3 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 29 Jul 2023 01:20:07 +0800 Subject: gnu: Add go-gopkg-in-op-go-logging-v1. * gnu/packages/golang-xyz.scm (go-gopkg-in-op-go-logging-v1): New variable. Signed-off-by: Sharlatan Hellseher Change-Id: I73b0ab7ed1e0f46a5bf8e4f92bcf3028dbf1a336 --- gnu/packages/golang-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index f4ffd3b6eb..b0a5955405 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1013,6 +1013,15 @@ (define-public go-go-uber-org-automaxprocs CPU quota.") (license license:expat))) +(define-public go-gopkg-in-op-go-logging-v1 + (package + (inherit go-github-com-op-go-logging) + (name "go-gopkg-in-op-go-logging-v1") + (arguments + (substitute-keyword-arguments + (package-arguments go-github-com-op-go-logging) + ((#:import-path _) "gopkg.in/op/go-logging.v1"))))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit v1.2.3 From d1a5af5adb11faf8dc8ee03fb75ee289867516d0 Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Thu, 15 Feb 2024 23:48:16 +0100 Subject: gnu: Add go-github-com-orisano-pixelmatch. * gnu/packages/golang-xyz.scm (go-github-com-orisano-pixelmatch): New variable. Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index b0a5955405..9c741f6600 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -860,6 +860,31 @@ (define-public go-github-com-op-go-logging levels per backend and logger.") (license license:bsd-3))) +(define-public go-github-com-orisano-pixelmatch + (package + (name "go-github-com-orisano-pixelmatch") + (version "0.0.0-20230914042517-fa304d1dc785") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orisano/pixelmatch") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lplxfif5mfqnd0jjph2vd25c3bpr3idfs2axh8z0ib0zdkwca32")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/orisano/pixelmatch")) + (home-page "https://github.com/orisano/pixelmatch") + (synopsis "Pixelmatch port to Go") + (description + "This package provides a port of Pixelmatch, a pixel-level image +comparison library, to Go. Both a library and a command-line tool are +included in this package.") + (license license:expat))) + (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") (revision "2")) -- cgit v1.2.3 From 4bbca060daf59622d027c874c9e9a2d715c286a7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 22:26:36 +0000 Subject: gnu: Add go-pixelmatch. * gnu/packages/golang-xyz.scm (go-pixelmatch): New variable. Change-Id: Iaf1480d7ee938605644e27345c2e7a2b6cf8b9e0 --- gnu/packages/golang-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 9c741f6600..4e0c0e8a28 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -52,6 +52,10 @@ (define-module (gnu packages golang-xyz) ;;; ;;; Code: +;;; +;;; Libraries: +;;; + (define-public go-github-com-a8m-envsubst (package (name "go-github-com-a8m-envsubst") @@ -1047,6 +1051,24 @@ (define-public go-gopkg-in-op-go-logging-v1 (package-arguments go-github-com-op-go-logging) ((#:import-path _) "gopkg.in/op/go-logging.v1"))))) +;;; +;;; Executables: +;;; + +(define-public go-pixelmatch + (package + (inherit go-github-com-orisano-pixelmatch) + (name "go-pixelmatch") + (arguments + (list + #:import-path "github.com/orisano/pixelmatch/cmd/pixelmatch" + #:unpack-path "github.com/orisano/pixelmatch" + #:install-source? #f)) + (synopsis "Pixel-level image comparison command") + (description + "This package provides a CLI build from the +go-github-com-orisano-pixelmatch source."))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit v1.2.3 From f5de1f96ed46c427b67d78304977884ff7165538 Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sun, 18 Feb 2024 13:45:36 +0100 Subject: gnu: Add go-github-com-coocood-freecache. * gnu/packages/golang-xyz.scm (go-github-com-coocood-freecache): New variable. Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 4e0c0e8a28..836357bb02 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -268,6 +268,33 @@ (define-public go-github-com-burntsushi-toml similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) +(define-public go-github-com-coocood-freecache + (package + (name "go-github-com-coocood-freecache") + (version "1.2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coocood/freecache") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0iw0s07qy8g1lncwl524c524wh56djl0vn6i3bm91cnwzav7ihjl")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/coocood/freecache")) + (propagated-inputs (list go-github-com-cespare-xxhash)) + (home-page "https://github.com/coocood/freecache") + (synopsis "Caching library for Go") + (description + "This library provides caching capabilities for Go with no garbage +collection overhead and high concurrent performance. An unlimited number of +objects can be cached in memory without increased latency or degraded +throughput.") + (license license:expat))) + (define-public go-github-com-coreos-go-systemd-activation (package (name "go-github-com-coreos-go-systemd-activation") -- cgit v1.2.3 From 084ce22aa336cc92104d586ede30b583fb9e6fef Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 17 Feb 2024 17:24:33 +0300 Subject: gnu: Add go-github-com-benbjohnson-clock. * gnu/packages/golang-xyz.scm (go-github-com-benbjohnson-clock): New variable. Change-Id: Ifcb3254e07388a6c7b4a7f9ee5dff4f3b4d25ee8 Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 836357bb02..b6e582fdc5 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -150,6 +150,31 @@ (define-public go-github-com-armon-go-radix @url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.") (license license:expat))) +(define-public go-github-com-benbjohnson-clock + (package + (name "go-github-com-benbjohnson-clock") + (version "1.3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/benbjohnson/clock") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1p7n09pywqra21l981fbkma9vzsyf31pbvw6xg5r4hp8h8scf955")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/benbjohnson/clock" + #:go ,go-1.21)) + (home-page "https://github.com/benbjohnson/clock") + (synopsis "Small library for mocking time in Go") + (description + "@code{clock} is a small library for mocking time in Go. It provides an +interface around the standard library's @code{time} package so that the application +can use the realtime clock while tests can use the mock clock.") + (license license:expat))) + (define-public go-github-com-bitly-go-hostpool (package (name "go-github-com-bitly-go-hostpool") -- cgit v1.2.3 From 930692feb0d26c2d9ab5715a2a84196eef13f221 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 14 Feb 2024 23:55:37 +0300 Subject: gnu: Add go-github-com-dustin-gojson. * gnu/packages/golang.scm (go-github-com-dustin-gojson): New variable. Change-Id: Ifc3df4e7a2cdf21bf0725a848123930d61d048e3 Signed-off-by: Sharlatan Hellseher --- gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index b6e582fdc5..d6aa5d0538 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -519,6 +519,42 @@ (define-public go-github-com-djherbis-atime atimes for files.") (license license:expat))) +(define-public go-github-com-dustin-gojson + (package + (name "go-github-com-dustin-gojson") + (version "v0.0.0-20160307161227-2e71ec9dd5ad") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dustin/gojson") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vrmmyn7l568l1k71mxd54iqf3d54pn86cf278i374j86jn0bdxf")) + (modules '((guix build utils))) + (snippet '(begin + ;; Fix the library to work with go-1.21. + (substitute* "decode.go" + (("trying to unmarshal unquoted value into") + "trying to unmarshal unquoted value %v into")) + (substitute* "decode_test.go" + (("t.Fatalf\\(\"Unmarshal: %v\"\\)") + "t.Fatalf(\"Unmarshal: %v\", data)")) ;)))) + (substitute* "scanner.go" + (("s := strconv.Quote\\(string\\(c\\)\\)") + "s := strconv.QuoteRune(rune(c))")))))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/dustin/gojson" + #:go ,go-1.21)) + (home-page "https://github.com/dustin/gojson") + (synopsis "Extended Golang's @code{encoding/json} module with the public scanner API") + (description + "This package provides a fork of Golang's @code{encoding/json} with the +scanner API made public.") + (license license:bsd-3))) + (define-public go-github-com-elliotchance-orderedmap (package (name "go-github-com-elliotchance-orderedmap") -- cgit v1.2.3 From ee79286031e87fc7f2e5477a56a9c49b74971080 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 16 Feb 2024 15:17:56 +0000 Subject: gnu: go-github-com-alecthomas-chroma: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-alecthomas-chroma): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/configuration-management.scm: Add (gnu packages golang-xyz) module. Change-Id: I0f5f7068f530b282f3636678e9edc4fad6c8c94a --- gnu/packages/configuration-management.scm | 1 + gnu/packages/golang-xyz.scm | 33 ++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 29 --------------------------- 3 files changed, 33 insertions(+), 30 deletions(-) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 6632f429e2..d0105ea75c 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -23,6 +23,7 @@ (define-module (gnu packages configuration-management) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index d6aa5d0538..a31cd74b3d 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3,15 +3,16 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2023 Benjamin ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday -;;; Copyright © 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2023 Timo Wilken +;;; Copyright © 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. @@ -79,6 +80,36 @@ (define-public go-github-com-a8m-envsubst substitution.") (license license:expat))) +(define-public go-github-com-alecthomas-chroma + (package + (name "go-github-com-alecthomas-chroma") + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/chroma") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/alecthomas/chroma")) + (native-inputs + (list go-github-com-dlclark-regexp2 + go-github-com-alecthomas-assert + go-github-com-alecthomas-colour + go-github-com-alecthomas-repr + go-github-com-mattn-go-isatty + go-github-com-sergi-go-diff)) + (home-page "https://github.com/alecthomas/chroma/") + (synopsis "General purpose syntax highlighter in pure Go") + (description + "Chroma takes source code and other structured text and converts it into +syntax highlighted HTML, ANSI-coloured text, etc.") + (license license:expat))) + (define-public go-github-com-alecthomas-participle-v2 (package (name "go-github-com-alecthomas-participle-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c22e4ba005..6eac90bef4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7643,35 +7643,6 @@ (define-public go-github-com-sergi-go-diff @end itemize\n") (license license:expat))) -(define-public go-github-com-alecthomas-chroma - (package - (name "go-github-com-alecthomas-chroma") - (version "0.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/chroma") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/chroma")) - (native-inputs - (list go-github-com-dlclark-regexp2 - go-github-com-alecthomas-assert - go-github-com-alecthomas-colour - go-github-com-alecthomas-repr - go-github-com-mattn-go-isatty - go-github-com-sergi-go-diff)) - (home-page "https://github.com/alecthomas/chroma/") - (synopsis "General purpose syntax highlighter in pure Go") - (description "Chroma takes source code and other structured text and -converts it into syntax highlighted HTML, ANSI-coloured text, etc.") - (license license:expat))) - (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") -- cgit v1.2.3 From 73eb26cbd7eb7d1abc906812cc46ae96906a6a9c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 16 Feb 2024 15:23:33 +0000 Subject: gnu: go-github-com-alecthomas-chroma: Update to 0.10.0. * gnu/packages/golang-xyz.scm (go-github-com-alecthomas-chroma): Update to 0.10.0. [native-inputs]: Remove go-github-com-alecthomas-assert, go-github-com-alecthomas-colour, go-github-com-alecthomas-repr, go-github-com-mattn-go-isatty, and go-github-com-sergi-go-diff; add go-github-com-stretchr-testify. Change-Id: I9d72bbdeb97a3c94545ff08d356c5e568fe173c6 --- gnu/packages/golang-xyz.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index a31cd74b3d..cc1b68cf7d 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -83,7 +83,7 @@ (define-public go-github-com-a8m-envsubst (define-public go-github-com-alecthomas-chroma (package (name "go-github-com-alecthomas-chroma") - (version "0.8.0") + (version "0.10.0") (source (origin (method git-fetch) @@ -92,17 +92,13 @@ (define-public go-github-com-alecthomas-chroma (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1")))) + (base32 "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq")))) (build-system go-build-system) (arguments `(#:import-path "github.com/alecthomas/chroma")) (native-inputs (list go-github-com-dlclark-regexp2 - go-github-com-alecthomas-assert - go-github-com-alecthomas-colour - go-github-com-alecthomas-repr - go-github-com-mattn-go-isatty - go-github-com-sergi-go-diff)) + go-github-com-stretchr-testify)) (home-page "https://github.com/alecthomas/chroma/") (synopsis "General purpose syntax highlighter in pure Go") (description -- cgit v1.2.3 From 18f44da03b9505ab7d232111222cf01fc561ca22 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 16 Feb 2024 23:29:54 +0000 Subject: gnu: go-github-com-alecthomas-chroma: Remove bundled files. * gnu/packages/golang-xyz.scm (go-github-com-alecthomas-chroma) [source]: Remove git submodules and generated files. Change-Id: Idafee9723b837495084aa0cd2fb454a953ff6233 --- gnu/packages/golang-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index cc1b68cf7d..5b42f10b3f 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -92,8 +92,12 @@ (define-public go-github-com-alecthomas-chroma (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq")))) + (base32 "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq")) + (modules '((guix build utils))) + ;; Delete git submodules and generated files by Hermit. + (snippet '(delete-file-recursively "bin")))) (build-system go-build-system) + ;; TODO: Build cmd/chroma and cmd/chromad commands. (arguments `(#:import-path "github.com/alecthomas/chroma")) (native-inputs -- cgit v1.2.3 From 5890d3b70f94fa84001c39c989fb48b00cd9b4a6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 17 Feb 2024 00:19:04 +0000 Subject: gnu: Add go-github-com-alecthomas-chroma-v2. * gnu/packages/golang-xyz.scm (go-github-com-alecthomas-chroma-v2): New variable. Change-Id: I883a1ca1a84fd35cf0d7fe946fd1caedafae3842 --- gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 5b42f10b3f..32b9be40b6 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -110,6 +110,29 @@ (define-public go-github-com-alecthomas-chroma syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) +(define-public go-github-com-alecthomas-chroma-v2 + (package + (inherit go-github-com-alecthomas-chroma) + (name "go-github-com-alecthomas-chroma-v2") + (version "2.12.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/chroma") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j9zz77ppi4r4ncnanzj84h7bsg0qdqrhgd5kkjiv09afm31jx83")))) + (arguments + (list #:go go-1.19 + #:import-path "github.com/alecthomas/chroma/v2")) + (propagated-inputs + (list go-github-com-dlclark-regexp2)) + (native-inputs + (list go-github-com-alecthomas-assert-v2 + go-github-com-alecthomas-repr)))) + (define-public go-github-com-alecthomas-participle-v2 (package (name "go-github-com-alecthomas-participle-v2") -- cgit v1.2.3 From efa4809384e4b82395818431b1d37a0dbfe89ba5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 17 Feb 2024 00:35:59 +0000 Subject: gnu: go-github-com-songmu-gitconfig: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-songmu-gitconfig): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/version-control.scm: Add (gnu packages golang-xyx) module. Change-Id: Ibab2595d981d46096501bb8ab495e899d2aacf7d --- gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- gnu/packages/version-control.scm | 1 + 3 files changed, 29 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 32b9be40b6..ff62b83995 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen @@ -1136,6 +1137,33 @@ (define-public go-github-com-songgao-water Use waterutil with it to work with TUN/TAP packets/frames.") (license license:bsd-3))) +(define-public go-github-com-songmu-gitconfig + (package + (name "go-github-com-songmu-gitconfig") + (version "0.1.0") + (home-page "https://github.com/songmu/gitconfig") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/Songmu/gitconfig" + ;; Package's tests appear to be hardcoded to the author's gitconfig + ;; and require network access. + #:tests? #f)) + (propagated-inputs + (list go-github-com-goccy-yaml)) + (synopsis "Go library to get configuration values from gitconfig") + (description + "@{gitconfig} is a package to get configuration values from gitconfig.") + (license license:expat))) + (define-public go-github-com-stathat-go (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6eac90bef4..e95cd235da 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8960,32 +8960,6 @@ (define-public go-github-com-tekwizely-go-parsing parsers, and related tools.") (license license:expat)))) -(define-public go-github-com-songmu-gitconfig - (package - (name "go-github-com-songmu-gitconfig") - (version "0.1.0") - (home-page "https://github.com/songmu/gitconfig") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/Songmu/gitconfig" - ;; Package's tests appear to be hardcoded to the author's gitconfig - ;; and require network access. - #:tests? #f)) - (propagated-inputs - (list go-github-com-goccy-yaml)) - (synopsis "Go library to get configuration values from gitconfig") - (description "@{gitconfig} is a package to get configuration values from gitconfig.") - (license license:expat))) - (define-public go-github-com-akosmarton-papipes (let ((commit "3c63b4919c769c9c2b2d07e69a98abb0eb47fe64") (revision "0")) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index afef900bbb..a7ac89b7d9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -110,6 +110,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) -- cgit v1.2.3 From 92b5c13c6ad16cebb2c92c41fac3c86138749b86 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 17 Feb 2024 00:39:17 +0000 Subject: gnu: go-github-com-songmu-gitconfig: Fix build. As seen in . * gnu/packages/golang-xyz.scm go-github-com-songmu-gitconfig: Update style. [arguments] <#:go>: Use go-1.21. Change-Id: Iea7a32b51d4bd74e99c52938307c11177ae79199 --- gnu/packages/golang-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/golang-xyz.scm') diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index ff62b83995..e68948e495 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1153,10 +1153,12 @@ (define-public go-github-com-songmu-gitconfig (base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/Songmu/gitconfig" - ;; Package's tests appear to be hardcoded to the author's gitconfig - ;; and require network access. - #:tests? #f)) + (list + ;; Package's tests appear to be hardcoded to the author's gitconfig + ;; and require network access. + #:tests? #f + #:go go-1.21 + #:import-path "github.com/Songmu/gitconfig")) (propagated-inputs (list go-github-com-goccy-yaml)) (synopsis "Go library to get configuration values from gitconfig") -- cgit v1.2.3