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') 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 @@ #: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 @@ 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 @@ synchronizing plain text: @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