sharlatan pushed a commit to branch master
in repository guix.
commit cd49133bfe97d6336adc85b1b587e335721cbdaa
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Wed Mar 6 23:21:12 2024 +0000
gnu: go-github-com-hashicorp-hcl: Move to golang-xyz.
* gnu/packages/golang.scm (go-github-com-hashicorp-hcl): Move from here ...
* gnu/packages/golang-xyz.scm: ... to here.
Change-Id: I431689059384d203cdb1c2d40f16ef9c5958b5ab
---
gnu/packages/golang-xyz.scm | 30 +++++++++++++++++++++++++++++-
gnu/packages/golang.scm | 27 ---------------------------
2 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 7221a54b6a..5911461a59 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018, 2019 Leo Famulari <[email protected]>
+;;; Copyright © 2018 Christopher Baines <[email protected]>
;;; Copyright © 2018 Pierre-Antoine Rouby <[email protected]>
;;; Copyright © 2019 Brian Leung <[email protected]>
;;; Copyright © 2019 Leo Famulari <[email protected]>
@@ -10,6 +11,7 @@
;;; Copyright © 2021 Guillaume Le Vaillant <[email protected]>
;;; Copyright © 2021 Raghav Gururajan <[email protected]>
;;; Copyright © 2021 Sarah Morgensen <[email protected]>
+;;; Copyright © 2021, 2023, 2024 Sharlatan Hellseher <[email protected]>
;;; Copyright © 2022 Dominic Martinez <[email protected]>
;;; Copyright © 2023 Benjamin <[email protected]>
;;; Copyright © 2023 Hilton Chain <[email protected]>
@@ -17,7 +19,6 @@
;;; Copyright © 2023 Nicolas Graves <[email protected]>
;;; Copyright © 2023 Thomas Ieong <[email protected]>
;;; Copyright © 2023 Timo Wilken <[email protected]>
-;;; Copyright © 2023, 2024 Sharlatan Hellseher <[email protected]>
;;; Copyright © 2024 Artyom V. Poptsov <[email protected]>
;;; Copyright © 2024 Troy Figiel <[email protected]>
;;;
@@ -793,6 +794,33 @@ Differentiation between text and binary files}.
wrapping errors and checking if an error contains another error.")
(license license:mpl2.0)))
+(define-public go-github-com-hashicorp-hcl
+ (package
+ (name "go-github-com-hashicorp-hcl")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hashicorp/hcl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:import-path "github.com/hashicorp/hcl"))
+ (native-inputs
+ (list go-github-com-davecgh-go-spew))
+ (synopsis "Go implementation of HashiCorp Configuration Language V1")
+ (description
+ "This package contains the main implementation of the @acronym{HCL,
+HashiCorp Configuration Language}. HCL is designed to be a language for
+expressing configuration which is easy for both humans and machines to read.")
+ (home-page "https://github.com/hashicorp/hcl")
+ (license license:mpl2.0)))
+
(define-public go-github-com-hashicorp-go-multierror
(package
(name "go-github-com-hashicorp-go-multierror")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d1f6bada15..3fa3ed7ebf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3304,33 +3304,6 @@ command-line parsers.")
(home-page "https://github.com/tj/docopt")
(license license:expat)))
-(define-public go-github-com-hashicorp-hcl
- (package
- (name "go-github-com-hashicorp-hcl")
- (version "1.0.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/hashicorp/hcl")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/hashicorp/hcl"))
- (native-inputs
- (list go-github-com-davecgh-go-spew))
- (synopsis "Go implementation of HashiCorp Configuration Language V1")
- (description
- "This package contains the main implementation of the @acronym{HCL,
-HashiCorp Configuration Language}. HCL is designed to be a language for
-expressing configuration which is easy for both humans and machines to read.")
- (home-page "https://github.com/hashicorp/hcl")
- (license license:mpl2.0)))
-
(define-public go-github-com-hashicorp-hcl-v2
(package
(name "go-github-com-hashicorp-hcl-v2")