[PATCH 00/10] Fix failed builds from evaluation 1123386.

  • Done
  • quality assurance status badge
Details
2 participants
  • Sharlatan Hellseher
  • Troy Figiel
Owner
unassigned
Submitted by
Sharlatan Hellseher
Severity
normal
S
S
Sharlatan Hellseher wrote on 17 Feb 13:49 +0100
(address . guix-patches@gnu.org)
8734trmf1h.fsf@gmail.com
Hi Guix!

After I've pushed


it introduced some package build regression as seen in


This patch series fixes them.

Thanks,
Oleg

Sharlatan Hellseher (10):
gnu: go-github-com-alecthomas-chroma: Move to golang-xyz.
gnu: go-github-com-alecthomas-chroma: Update to 0.10.0.
gnu: go-github-com-alecthomas-chroma: Remove bundled files.
gnu: Add go-github-com-alecthomas-chroma-v2.
gnu: go-github-com-alecthomas-assert: Depricate package.
gnu: go-github-com-alecthomas-assert-v2: Update to 2.5.0.
gnu: go-github-com-songmu-gitconfig: Move to golang-xyz.
gnu: go-github-com-songmu-gitconfig: Fix build.
gnu: ghq: Remove package labels.
gnu: ghq: Fix build.

gnu/packages/configuration-management.scm | 1 +
gnu/packages/golang-check.scm | 50 ++++---------
gnu/packages/golang-xyz.scm | 86 ++++++++++++++++++++++-
gnu/packages/golang.scm | 55 ---------------
gnu/packages/version-control.scm | 52 +++++++-------
5 files changed, 125 insertions(+), 119 deletions(-)


base-commit: 91d80460296e2d5a01704d0f34fb966a45a165ae
--
2.41.0
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmXQq1oACgkQdtcnv/Ys
0rUV8Q//R+xZ/Vl8S/lsSHntwF98Hc5fMw3VgibaX+zWTAz54s+N9OB+s1I55E2Y
StMkQosEjrypsvmMfOpUyFBiD3UPq8+AWeOjY00Dl1Lh88PI5bdTlARpQ8RvtF/K
XM/BUMINENr/F/P1j9GXHoteZ00l9CY2wn5JF3YmLM8OvRLsFv2pEz0smplWD95u
wDwo4JcOYvKxmcrChXVY/o+0/TKDf9+4oSF7oGFFrOFRJ8FR+nYd4lVbCrOqpCuy
ee1hfC8R2dUxmCb6lnifTPY4Ovqeeb64yxcorjCnyMSv5H9ZtkpAqhlB35V/yVf5
3TBY69l8COSNDavIAf0N4g7q1uN2X/QeVANbApAVPW3aotQXaaD/WT8pFd7MNBxd
yZeMeLBqCl1Cqma7jWiqnbWj4IXfGozGSPZGAqE6lMAg+gCHXuqo3N45Xs1alh0A
QzKwsceQB65YiFFZ/WoCsTEAakQHQLlsdcqHeNIzNqnGPDj4z9VsnJwXpTNDMlZw
zDt9imuqS15yjGatI8PxpTT0NN3Cs/t9T7BUDuFydCfwS6aOzmCbNALh63KtU7uV
0Ixozxe4z/ximxDRY6wb3ky3ZflpiPwZpZsn02u2IhTHxSudvDzIMA4hKp1FcC/x
m566FExn6LASlYS2iP73YGUAPDIsjrIRpT47VIEIkb4ye8i7u10=
=ll9Q
-----END PGP SIGNATURE-----

S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 02/10] gnu: go-github-com-alecthomas-chroma: Update to 0.10.0.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
8141791741a9f920290f16f96e3a90d9a7ef5ae2.1708155311.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 024b38bd6e..662341bf93 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -79,7 +79,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)
@@ -88,17 +88,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
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 03/10] gnu: go-github-com-alecthomas-chroma: Remove bundled files.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
9db108cc503166a72e056dfa82092f68f5ce3bc9.1708155311.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 662341bf93..60ba4c0da4 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -88,8 +88,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
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 04/10] gnu: Add go-github-com-alecthomas-chroma-v2.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
a574c3bb535f4344fa9d9669195fd49db20ba672.1708155311.git.sharlatanus@gmail.com
* 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(+)

Toggle diff (36 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 60ba4c0da4..c64200d365 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -106,6 +106,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")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 01/10] gnu: go-github-com-alecthomas-chroma: Move to golang-xyz.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
3961dc26b001f96986279a0039f926c20b326203.1708155311.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (113 lines)
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 b0a5955405..024b38bd6e 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -3,15 +3,16 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
-;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -75,6 +76,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 527b63d160..d877135282 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7620,35 +7620,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")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 05/10] gnu: go-github-com-alecthomas-assert: Depricate package.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
662195cd762bd4c108da297964a6f428b55e58fb.1708155311.git.sharlatanus@gmail.com
The package go-github-com-alecthomas-assert is succeeded by
go-github-com-alecthomas-assert-v2 not in use by any others and

* gnu/packages/golang-check.scm (go-github-com-alecthomas-assert):
Remove variable.

Change-Id: Ia3f7b039c4de9b1b2956f0bfc2629d791aa9cf5a
---
gnu/packages/golang-check.scm | 46 ++++++++---------------------------
1 file changed, 10 insertions(+), 36 deletions(-)

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 4874e0c9ae..64d0c68081 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -60,43 +60,8 @@ (define-module (gnu packages golang-check)
;;; Libraries:
;;;
-(define-public go-github-com-alecthomas-assert
- (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06")
- (revision "1"))
- (package
- (name "go-github-com-alecthomas-assert")
- (version (git-version "0.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/alecthomas/assert")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/alecthomas/assert"))
- (native-inputs
- (list go-github-com-alecthomas-colour
- go-github-com-mattn-go-isatty
- go-github-com-alecthomas-repr
- go-github-com-sergi-go-diff))
- (home-page "https://github.com/alecthomas/assert/")
- (synopsis "Go assertion library")
- (description "Assertion library that:
-@itemize
-@item makes spotting differences in equality much easier
-@item uses repr and diffmatchpatch to display structural differences in colour
-@item aborts tests on first assertion failure
-@end itemize\n")
- (license license:expat))))
-
(define-public go-github-com-alecthomas-assert-v2
(package
- (inherit go-github-com-alecthomas-assert)
(name "go-github-com-alecthomas-assert-v2")
(version "2.2.2")
(source
@@ -108,13 +73,22 @@ (define-public go-github-com-alecthomas-assert-v2
(file-name (git-file-name name version))
(sha256
(base32 "055w46gr47rrn5g2hh7z6hj3x2b8advbcph8gs8szrpzlympyyz0"))))
+ (build-system go-build-system)
(arguments
(list #:go go-1.18
#:import-path "github.com/alecthomas/assert/v2"))
(propagated-inputs
(list go-github-com-alecthomas-repr
go-github-com-hexops-gotextdiff))
- (native-inputs '())))
+ (home-page "https://github.com/alecthomas/assert/")
+ (synopsis "Go assertion library")
+ (description "Assertion library that:
+@itemize
+@item makes spotting differences in equality much easier
+@item uses repr and diffmatchpatch to display structural differences in colour
+@item aborts tests on first assertion failure
+@end itemize")
+ (license license:expat)))
(define-public go-github-com-cheekybits-is
(let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 06/10] gnu: go-github-com-alecthomas-assert-v2: Update to 2.5.0.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
caa99a3a4cb9b37c8ddb2a9f411f1bc46f91cea7.1708155311.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-alecthomas-assert-v2): Update to 2.5.0.

Change-Id: Ie0a1ad0488b499092437ce56f9df83d90d1be1e9
---
gnu/packages/golang-check.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 64d0c68081..aaa2de33a6 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -63,7 +63,7 @@ (define-module (gnu packages golang-check)
(define-public go-github-com-alecthomas-assert-v2
(package
(name "go-github-com-alecthomas-assert-v2")
- (version "2.2.2")
+ (version "2.5.0")
(source
(origin
(method git-fetch)
@@ -72,7 +72,7 @@ (define-public go-github-com-alecthomas-assert-v2
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "055w46gr47rrn5g2hh7z6hj3x2b8advbcph8gs8szrpzlympyyz0"))))
+ (base32 "1ai26ncfcwzg47rqaigs5v1fzfz6i8p11ki75ni5429xkjs77riz"))))
(build-system go-build-system)
(arguments
(list #:go go-1.18
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 08/10] gnu: go-github-com-songmu-gitconfig: Fix build.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
24db7997cb34efd64a441b10353c6d41137d7408.1708155311.git.sharlatanus@gmail.com

* 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(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a6031a8354..2408916c39 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1036,10 +1036,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")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:39 +0100
[PATCH 07/10] gnu: go-github-com-songmu-gitconfig: Move to golang-xyz.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
de0b5d48b993a44a33fdb46f596b5da019ec163c.1708155311.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (97 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index c64200d365..a6031a8354 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -1019,6 +1020,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 d877135282..5ba69b480d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8930,32 +8930,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 51754245d3..d7750ed269 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)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:40 +0100
[PATCH 09/10] gnu: ghq: Remove package labels.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
ffb0ecf3e1350d9ecf13bd651d9cde99faef5b99.1708155311.git.sharlatanus@gmail.com
* gnu/packages/version-control.scm (ghq): Remove labels.

Change-Id: Icc4b951bac4a1187c5d83a8309753d1dd842273a
---
gnu/packages/version-control.scm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index d7750ed269..b2bcca8b1e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3738,15 +3738,15 @@ (define-public ghq
(string-append zsh-completion "/_ghq"))))
#t)))))
(native-inputs
- `(("git" ,git-minimal)))
+ (list git-minimal))
(inputs
- `(("github.com/songmu/gitconfig" ,go-github-com-songmu-gitconfig)
- ("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
- ("github.com/motemen/go-colorine" ,go-github-com-motemen-go-colorine)
- ("github.com/saracen/walker" ,go-github-com-saracen-walker)
- ("github.com/urfave/cli/v2" ,go-github-com-urfave-cli-v2)
- ("golang.org/x/net/html" ,go-golang-org-x-net-html)
- ("golang.org/x/sync/errgroup" ,go-golang.org-x-sync-errgroup)))
+ (list go-github-com-songmu-gitconfig
+ go-github-com-mattn-go-isatty
+ go-github-com-motemen-go-colorine
+ go-github-com-saracen-walker
+ go-github-com-urfave-cli-v2
+ go-golang-org-x-net-html
+ go-golang.org-x-sync-errgroup))
(synopsis "Manage remote repository clones")
(description
"@code{ghq} provides a way to organize remote repository clones, like
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 19:40 +0100
[PATCH 10/10] gnu: ghq: Fix build.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
99555416c787fd6d58760a281799b0cf53ca1da6.1708155311.git.sharlatanus@gmail.com

* gnu/packages/version-control.scm (ghq): Use G-expressions.
[arguments] <#:go>: Use go-1.21.
<#:phases>: Remove trailing #t from lambda.

Change-Id: Ifb1e133a2570dcd04212ef43b46c8b41c3507c88
---
gnu/packages/version-control.scm | 35 ++++++++++++++++----------------
1 file changed, 18 insertions(+), 17 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index b2bcca8b1e..705a7facdc 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3720,23 +3720,24 @@ (define-public ghq
"155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh"))))
(build-system go-build-system)
(arguments
- '(#:install-source? #f
- #:import-path "github.com/x-motemen/ghq"
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-completions
- (lambda* (#:key outputs import-path #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bash-completion (string-append out "/etc/bash_completion.d"))
- (zsh-completion (string-append out "/share/zsh/site-functions")))
- (with-directory-excursion (string-append "src/" import-path)
- (mkdir-p bash-completion)
- (copy-file "misc/bash/_ghq"
- (string-append bash-completion "/ghq"))
- (mkdir-p zsh-completion)
- (copy-file "misc/zsh/_ghq"
- (string-append zsh-completion "/_ghq"))))
- #t)))))
+ (list
+ #:install-source? #f
+ #:go go-1.21
+ #:import-path "github.com/x-motemen/ghq"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-completions
+ (lambda* (#:key outputs import-path #:allow-other-keys)
+ (let* ((out #$output)
+ (bash-completion (string-append out "/etc/bash_completion.d"))
+ (zsh-completion (string-append out "/share/zsh/site-functions")))
+ (with-directory-excursion (string-append "src/" import-path)
+ (mkdir-p bash-completion)
+ (copy-file "misc/bash/_ghq"
+ (string-append bash-completion "/ghq"))
+ (mkdir-p zsh-completion)
+ (copy-file "misc/zsh/_ghq"
+ (string-append zsh-completion "/_ghq")))))))))
(native-inputs
(list git-minimal))
(inputs
--
2.41.0
T
T
Troy Figiel wrote on 18 Feb 21:34 +0100
Re: [bug#69238] [PATCH 05/10] gnu: go-github-com-alecthomas-assert: Depricate package.
eea4f03f-ceff-4c9c-b4ff-3405a3ada574@troyfigiel.com
Hi Oleg,

Small typo I happened to spot: sed 's/depricate/deprecate/' for the
commit message.

Best wishes,

Troy

On 2024-02-18 19:39, Sharlatan Hellseher wrote:
Toggle quote (84 lines)
> The package go-github-com-alecthomas-assert is succeeded by
> go-github-com-alecthomas-assert-v2 not in use by any others and
> failed to build, see <https://ci.guix.gnu.org/build/3490314/log/raw>.
>
> * gnu/packages/golang-check.scm (go-github-com-alecthomas-assert):
> Remove variable.
>
> Change-Id: Ia3f7b039c4de9b1b2956f0bfc2629d791aa9cf5a
> ---
> gnu/packages/golang-check.scm | 46 ++++++++---------------------------
> 1 file changed, 10 insertions(+), 36 deletions(-)
>
> diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
> index 4874e0c9ae..64d0c68081 100644
> --- a/gnu/packages/golang-check.scm
> +++ b/gnu/packages/golang-check.scm
> @@ -60,43 +60,8 @@ (define-module (gnu packages golang-check)
> ;;; Libraries:
> ;;;
>
> -(define-public go-github-com-alecthomas-assert
> - (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06")
> - (revision "1"))
> - (package
> - (name "go-github-com-alecthomas-assert")
> - (version (git-version "0.0.1" revision commit))
> - (source
> - (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url "https://github.com/alecthomas/assert")
> - (commit commit)))
> - (file-name (git-file-name name version))
> - (sha256
> - (base32
> - "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"))))
> - (build-system go-build-system)
> - (arguments
> - `(#:import-path "github.com/alecthomas/assert"))
> - (native-inputs
> - (list go-github-com-alecthomas-colour
> - go-github-com-mattn-go-isatty
> - go-github-com-alecthomas-repr
> - go-github-com-sergi-go-diff))
> - (home-page "https://github.com/alecthomas/assert/")
> - (synopsis "Go assertion library")
> - (description "Assertion library that:
> -@itemize
> -@item makes spotting differences in equality much easier
> -@item uses repr and diffmatchpatch to display structural differences in colour
> -@item aborts tests on first assertion failure
> -@end itemize\n")
> - (license license:expat))))
> -
> (define-public go-github-com-alecthomas-assert-v2
> (package
> - (inherit go-github-com-alecthomas-assert)
> (name "go-github-com-alecthomas-assert-v2")
> (version "2.2.2")
> (source
> @@ -108,13 +73,22 @@ (define-public go-github-com-alecthomas-assert-v2
> (file-name (git-file-name name version))
> (sha256
> (base32 "055w46gr47rrn5g2hh7z6hj3x2b8advbcph8gs8szrpzlympyyz0"))))
> + (build-system go-build-system)
> (arguments
> (list #:go go-1.18
> #:import-path "github.com/alecthomas/assert/v2"))
> (propagated-inputs
> (list go-github-com-alecthomas-repr
> go-github-com-hexops-gotextdiff))
> - (native-inputs '())))
> + (home-page "https://github.com/alecthomas/assert/")
> + (synopsis "Go assertion library")
> + (description "Assertion library that:
> +@itemize
> +@item makes spotting differences in equality much easier
> +@item uses repr and diffmatchpatch to display structural differences in colour
> +@item aborts tests on first assertion failure
> +@end itemize")
> + (license license:expat)))
>
> (define-public go-github-com-cheekybits-is
> (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
S
S
Sharlatan Hellseher wrote on 18 Feb 21:58 +0100
(name . Troy Figiel)(address . troy@troyfigiel.com)(address . 69238@debbugs.gnu.org)
CAO+9K5qc408nCj3GZe6Q+vaOxkQL6GJML68HdpTj1PZok8zBMQ@mail.gmail.com
Hi Troy,

Toggle quote (3 lines)
> Small typo I happened to spot: sed 's/depricate/deprecate/' for the
> commit message.

Thanks, typos are my Doom =)...

Sending v2.
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 02/10] gnu: go-github-com-alecthomas-chroma: Update to 0.10.0.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
31d6eafba4bbd94d06ff88945551485245ca4035.1708289807.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 024b38bd6e..662341bf93 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -79,7 +79,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)
@@ -88,17 +88,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
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 01/10] gnu: go-github-com-alecthomas-chroma: Move to golang-xyz.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
b6807bf457aa3debcd60c49908ebd1b147744e20.1708289807.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (115 lines)
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 b0a5955405..024b38bd6e 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -3,15 +3,16 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
-;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -75,6 +76,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 bde0c74859..59d0df0781 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")

base-commit: fdbf4192f5eaa7fdb5e6e2e98ada0726c8104824
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 03/10] gnu: go-github-com-alecthomas-chroma: Remove bundled files.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e227506c1977403e34e6b155af1bd5001ba4c02a.1708289807.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 662341bf93..60ba4c0da4 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -88,8 +88,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
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 05/10] gnu: go-github-com-alecthomas-assert: Deprecate package.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
aa86ebcfb10cfed49bf159709e8de430f8b594cb.1708289807.git.sharlatanus@gmail.com
The package go-github-com-alecthomas-assert is succeeded by
go-github-com-alecthomas-assert-v2 not in use by any others and

* gnu/packages/golang-check.scm (go-github-com-alecthomas-assert):
Remove variable.

Change-Id: Ia3f7b039c4de9b1b2956f0bfc2629d791aa9cf5a
---
gnu/packages/golang-check.scm | 46 ++++++++---------------------------
1 file changed, 10 insertions(+), 36 deletions(-)

Toggle diff (74 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 4874e0c9ae..64d0c68081 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -60,43 +60,8 @@ (define-module (gnu packages golang-check)
;;; Libraries:
;;;
-(define-public go-github-com-alecthomas-assert
- (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06")
- (revision "1"))
- (package
- (name "go-github-com-alecthomas-assert")
- (version (git-version "0.0.1" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/alecthomas/assert")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/alecthomas/assert"))
- (native-inputs
- (list go-github-com-alecthomas-colour
- go-github-com-mattn-go-isatty
- go-github-com-alecthomas-repr
- go-github-com-sergi-go-diff))
- (home-page "https://github.com/alecthomas/assert/")
- (synopsis "Go assertion library")
- (description "Assertion library that:
-@itemize
-@item makes spotting differences in equality much easier
-@item uses repr and diffmatchpatch to display structural differences in colour
-@item aborts tests on first assertion failure
-@end itemize\n")
- (license license:expat))))
-
(define-public go-github-com-alecthomas-assert-v2
(package
- (inherit go-github-com-alecthomas-assert)
(name "go-github-com-alecthomas-assert-v2")
(version "2.2.2")
(source
@@ -108,13 +73,22 @@ (define-public go-github-com-alecthomas-assert-v2
(file-name (git-file-name name version))
(sha256
(base32 "055w46gr47rrn5g2hh7z6hj3x2b8advbcph8gs8szrpzlympyyz0"))))
+ (build-system go-build-system)
(arguments
(list #:go go-1.18
#:import-path "github.com/alecthomas/assert/v2"))
(propagated-inputs
(list go-github-com-alecthomas-repr
go-github-com-hexops-gotextdiff))
- (native-inputs '())))
+ (home-page "https://github.com/alecthomas/assert/")
+ (synopsis "Go assertion library")
+ (description "Assertion library that:
+@itemize
+@item makes spotting differences in equality much easier
+@item uses repr and diffmatchpatch to display structural differences in colour
+@item aborts tests on first assertion failure
+@end itemize")
+ (license license:expat)))
(define-public go-github-com-cheekybits-is
(let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 06/10] gnu: go-github-com-alecthomas-assert-v2: Update to 2.5.0.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
371be67cbd9e1ffa67cad96384e9e93c2b7d7265.1708289807.git.sharlatanus@gmail.com
* gnu/packages/golang-check.scm (go-github-com-alecthomas-assert-v2): Update to 2.5.0.

Change-Id: Ie0a1ad0488b499092437ce56f9df83d90d1be1e9
---
gnu/packages/golang-check.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 64d0c68081..aaa2de33a6 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -63,7 +63,7 @@ (define-module (gnu packages golang-check)
(define-public go-github-com-alecthomas-assert-v2
(package
(name "go-github-com-alecthomas-assert-v2")
- (version "2.2.2")
+ (version "2.5.0")
(source
(origin
(method git-fetch)
@@ -72,7 +72,7 @@ (define-public go-github-com-alecthomas-assert-v2
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "055w46gr47rrn5g2hh7z6hj3x2b8advbcph8gs8szrpzlympyyz0"))))
+ (base32 "1ai26ncfcwzg47rqaigs5v1fzfz6i8p11ki75ni5429xkjs77riz"))))
(build-system go-build-system)
(arguments
(list #:go go-1.18
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 04/10] gnu: Add go-github-com-alecthomas-chroma-v2.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
e91a4e0981f138d6f41158ae229187b138b9966b.1708289807.git.sharlatanus@gmail.com
* 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(+)

Toggle diff (36 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 60ba4c0da4..c64200d365 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -106,6 +106,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")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 08/10] gnu: go-github-com-songmu-gitconfig: Fix build.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
fe8583254b8abeb81a8767c6cd5a153f5f84abd1.1708289807.git.sharlatanus@gmail.com

* 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(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a6031a8354..2408916c39 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1036,10 +1036,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")
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 07/10] gnu: go-github-com-songmu-gitconfig: Move to golang-xyz.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
21cdd9d73e2bfa79a1df93884b617fded0619d8f.1708289807.git.sharlatanus@gmail.com
* 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(-)

Toggle diff (97 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index c64200d365..a6031a8354 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -1019,6 +1020,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 59d0df0781..51f1c4d954 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8953,32 +8953,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)
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 09/10] gnu: ghq: Remove package labels.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
45099e5bde4bea700ce44d91bb73d228d0f94297.1708289807.git.sharlatanus@gmail.com
* gnu/packages/version-control.scm (ghq): Remove labels.

Change-Id: Icc4b951bac4a1187c5d83a8309753d1dd842273a
---
gnu/packages/version-control.scm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index a7ac89b7d9..242c2bf093 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3738,15 +3738,15 @@ (define-public ghq
(string-append zsh-completion "/_ghq"))))
#t)))))
(native-inputs
- `(("git" ,git-minimal)))
+ (list git-minimal))
(inputs
- `(("github.com/songmu/gitconfig" ,go-github-com-songmu-gitconfig)
- ("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
- ("github.com/motemen/go-colorine" ,go-github-com-motemen-go-colorine)
- ("github.com/saracen/walker" ,go-github-com-saracen-walker)
- ("github.com/urfave/cli/v2" ,go-github-com-urfave-cli-v2)
- ("golang.org/x/net/html" ,go-golang-org-x-net-html)
- ("golang.org/x/sync/errgroup" ,go-golang.org-x-sync-errgroup)))
+ (list go-github-com-songmu-gitconfig
+ go-github-com-mattn-go-isatty
+ go-github-com-motemen-go-colorine
+ go-github-com-saracen-walker
+ go-github-com-urfave-cli-v2
+ go-golang-org-x-net-html
+ go-golang.org-x-sync-errgroup))
(synopsis "Manage remote repository clones")
(description
"@code{ghq} provides a way to organize remote repository clones, like
--
2.41.0
S
S
Sharlatan Hellseher wrote on 18 Feb 21:59 +0100
[PATCH v2 10/10] gnu: ghq: Fix build.
(address . 69238@debbugs.gnu.org)(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)
03988e68eab5fd487fccaaae2f1fae4e46e9b9c3.1708289807.git.sharlatanus@gmail.com

* gnu/packages/version-control.scm (ghq): Use G-expressions.
[arguments] <#:go>: Use go-1.21.
<#:phases>: Remove trailing #t from lambda.

Change-Id: Ifb1e133a2570dcd04212ef43b46c8b41c3507c88
---
gnu/packages/version-control.scm | 35 ++++++++++++++++----------------
1 file changed, 18 insertions(+), 17 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 242c2bf093..3c43effbd1 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3720,23 +3720,24 @@ (define-public ghq
"155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh"))))
(build-system go-build-system)
(arguments
- '(#:install-source? #f
- #:import-path "github.com/x-motemen/ghq"
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-completions
- (lambda* (#:key outputs import-path #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bash-completion (string-append out "/etc/bash_completion.d"))
- (zsh-completion (string-append out "/share/zsh/site-functions")))
- (with-directory-excursion (string-append "src/" import-path)
- (mkdir-p bash-completion)
- (copy-file "misc/bash/_ghq"
- (string-append bash-completion "/ghq"))
- (mkdir-p zsh-completion)
- (copy-file "misc/zsh/_ghq"
- (string-append zsh-completion "/_ghq"))))
- #t)))))
+ (list
+ #:install-source? #f
+ #:go go-1.21
+ #:import-path "github.com/x-motemen/ghq"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-completions
+ (lambda* (#:key outputs import-path #:allow-other-keys)
+ (let* ((out #$output)
+ (bash-completion (string-append out "/etc/bash_completion.d"))
+ (zsh-completion (string-append out "/share/zsh/site-functions")))
+ (with-directory-excursion (string-append "src/" import-path)
+ (mkdir-p bash-completion)
+ (copy-file "misc/bash/_ghq"
+ (string-append bash-completion "/ghq"))
+ (mkdir-p zsh-completion)
+ (copy-file "misc/zsh/_ghq"
+ (string-append zsh-completion "/_ghq")))))))))
(native-inputs
(list git-minimal))
(inputs
--
2.41.0
S
S
Sharlatan Hellseher wrote on 20 Feb 01:06 +0100
[PATCH 00/10] Fix failed builds from evaluation 1123386.
(address . 69238-done@debbugs.gnu.org)
87a5nwhuck.fsf@gmail.com
Pushed as ee79286031..bd511903de to master.

--
Oleg
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmXT7RsACgkQdtcnv/Ys
0rWs9A/9Ef6abAZNrsOqh/JpyPq/W7i/jIUtu5Z/pHJOLOz/uI7BdGt9TjaiH8KK
YsZ08bpuchxcPmuRWFEBsJaVlhWaj4WbErYGLGkNDnxVif8OcU8ktppeABHCES1r
+cYyPYtl1UqB9R/PFC68lDhaqoIG027jNwDxaOTWkp2zhvkxG3ZdResQe5XS6Rvc
1yPSrXGT3z4lFZdYKmhdiNtpwoBuKxwF6uRvtWka3mmpJE8WW5Mu+SrWHIiOElCZ
EEWhy1t4pvHIJiWK4kZcuACF4otFVkyeNHTWdm6mpDzwnv6SwanAG7UqLTVxcXAm
AiOjGbMBeRfnDHuJY/A0cfLCq3GSoa4VwH8GrsiXBhJISP8BeNhq0dpTDvYX+jmE
KohEZhNKicdMtIn/AeYVtqc5OYi+Qn5/H/PgGkLN7Lnen052AkGcMykoJw7a0UN5
LSsYO6u5R3i76nYqdokurlcjhfkuDqwC+Gq83rudg2EKy6jFy1lOERsEM/3PVgvo
gU+wpfWwXZQ2V9rBpZFi9T6CjNcT0fRaBP2EGRQwoCPSg8cOziNpRd4QhawLKdqi
UBPl/s5LsEv7J4HRSzAAkrCzJFOth405yWtTKu8F/BVv0bBUd5bGR31iQyibjoMk
f3NIC90t3tLHtUwaYBGXFcZ2XXHQxbkUDgZLo9DHFEBsnVkEHCo=
=vGY/
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 69238@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 69238
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch