From f9ead8f7a832eb0b02b78de5ff379bfa0a1fc310 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 7 Feb 2024 21:28:03 +0000 Subject: gnu: go-github-com-burntsushi-toml: Move to golang-xyz. * gnu/packages/golang.scm (go-github-com-burntsushi-toml): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/golang-check.scm: Add (gnu packages golang-xyz) module. * gnu/packages/golang.scm: As above. * gnu/packages/shellutils.scm: As above. Change-Id: If8a645431a1fb17159681daae70db49fd21b37c1 --- gnu/packages/golang-check.scm | 3 ++- gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 23 ----------------------- gnu/packages/shellutils.scm | 1 + 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index c5e30f7fe1..8ce85421e9 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -42,7 +42,8 @@ (define-module (gnu packages golang-check) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang) - #:use-module (gnu packages golang-build)) + #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-xyz)) ;;; Commentary: ;;; diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index e4b6a09f2d..ee63a78cf7 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1,8 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019 Leo Famulari +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2023 Benjamin +;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2024 Artyom V. Poptsov @@ -87,6 +89,29 @@ (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-burntsushi-toml + (package + (name "go-github-com-burntsushi-toml") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BurntSushi/toml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/BurntSushi/toml")) + (home-page "https://github.com/BurntSushi/toml") + (synopsis "Toml parser and encoder for Go") + (description + "This package is toml parser and encoder for Go. The interface is +similar to Go's standard library @code{json} and @code{xml} package.") + (license license:expat))) + (define-public go-github-com-cyberdelia-go-metrics-graphite (package (name "go-github-com-cyberdelia-go-metrics-graphite") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 269bfdec95..5a2972427c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3808,29 +3808,6 @@ (define-public go-golang-org-x-mod loading algorithms.") (license license:bsd-3)))) -(define-public go-github-com-burntsushi-toml - (package - (name "go-github-com-burntsushi-toml") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/BurntSushi/toml") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/BurntSushi/toml")) - (home-page "https://github.com/BurntSushi/toml") - (synopsis "Toml parser and encoder for Go") - (description - "This package is toml parser and encoder for Go. The interface -is similar to Go's standard library @code{json} and @code{xml} package.") - (license license:expat))) - (define-public go-github-com-hashicorp-go-uuid (package (name "go-github-com-hashicorp-go-uuid") diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 00352dc327..48c5250c8c 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -51,6 +51,7 @@ (define-module (gnu packages shellutils) #:use-module (gnu packages check) #:use-module (gnu packages flex) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages libunistring) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) -- cgit v1.2.3