guix_mirror_bot pushed a commit to branch go-team
in repository guix.
commit 3694d53fe2c83715761c2a9d70597cbde0d7e4da
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Fri Oct 10 15:54:05 2025 +0100
gnu: Remove go-gopkg-in-inconshreveable-log15-v1.
* gnu/packages/golang-xyz.scm (go-gopkg-in-inconshreveable-log15-v1):
Delete variable.
(go-gopkg-in-inconshreveable-log15-v2): Don't inherit from
go-gopkg-in-inconshreveable-log15-v1, adopt missing fields from it
instead.
Change-Id: I9a892abc0122a79d0264ba9520028cec1c74ddb6
---
gnu/packages/golang-xyz.scm | 48 +++++++++++++--------------------------------
1 file changed, 14 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index f71bd37f78..7cbe290c29 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -23414,53 +23414,23 @@ distributions of benchmark measurements
(list
#:import-path "gopkg.in/alecthomas/kingpin.v2"))))
-(define-public go-gopkg-in-inconshreveable-log15-v1
- (package
- (name "go-gopkg-in-inconshreveable-log15-v1")
- (version "1.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/inconshreveable/log15")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1hz7vnzn4cbiqra443mhmp63ifzq15xsfnyc9jmxh2p1ngwxp2n2"))))
- (build-system go-build-system)
- (arguments
- (list
- #:test-flags #~(list "-skip" "TestFailoverHandler|TestLazy")
- #:import-path "gopkg.in/inconshreveable/log15.v1"))
- (native-inputs
- (list go-github-com-stretchr-testify))
- (home-page "https://pkg.go.dev/github.com/inconshreveable/log15")
- (synopsis "Structured, composable logging for Golang")
- (description
- "This package provides a toolkit for logging that is both human and
-machine readable. It is modeled after the Go standard library's @code{io} and
-@code{net/http} packages and is an alternative to the standard library's
-@code{log} package.")
- (license license:asl2.0)))
-
(define-public go-gopkg-in-inconshreveable-log15-v2
(package
- (inherit go-gopkg-in-inconshreveable-log15-v1)
(name "go-gopkg-in-inconshreveable-log15-v2")
(version "2.16.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/inconshreveable/log15")
- (commit (string-append "v" version))))
+ (url "https://github.com/inconshreveable/log15")
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "117ivm1asxw2hlwb3zf72q553ywjk00bsn21bpwi99q784ghr4wd"))))
+ (build-system go-build-system)
(arguments
(list
#:import-path "gopkg.in/inconshreveable/log15.v2"
- #:test-flags #~(list "-skip" "TestCallerStackHandler")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-import-path
@@ -23468,10 +23438,20 @@ machine readable. It is modeled after the Go
standard library's @code{io} and
(with-directory-excursion (string-append "src/" import-path)
(substitute* (find-files "." "\\.go$")
(("github.com/inconshreveable/log15") import-path))))))))
+ (native-inputs
+ (list go-github-com-stretchr-testify))
(propagated-inputs
(list go-github-com-go-stack-stack
go-github-com-mattn-go-colorable
- go-golang-org-x-term))))
+ go-golang-org-x-term))
+ (home-page "https://pkg.go.dev/github.com/inconshreveable/log15")
+ (synopsis "Structured, composable logging for Golang")
+ (description
+ "This package provides a toolkit for logging that is both human and
+machine readable. It is modeled after the Go standard library's @code{io} and
+@code{net/http} packages and is an alternative to the standard library's
+@code{log} package.")
+ (license license:asl2.0)))
(define-public go-gopkg-in-inconshreveable-log15-v3
(package