From 630089402ea57e60be3f292f38ab01df10df38b4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 10 Oct 2025 15:54:05 +0100 Subject: [PATCH] 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 | 56 ++++++++++++------------------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 82ceb3a50cc..fe971323329 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -23517,26 +23517,36 @@ distributions of benchmark measurements (list #:import-path "gopkg.in/alecthomas/kingpin.v2")))) -(define-public go-gopkg-in-inconshreveable-log15-v1 +(define-public go-gopkg-in-inconshreveable-log15-v2 (package - (name "go-gopkg-in-inconshreveable-log15-v1") - (version "1.2") + (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 "1hz7vnzn4cbiqra443mhmp63ifzq15xsfnyc9jmxh2p1ngwxp2n2")))) + (base32 "117ivm1asxw2hlwb3zf72q553ywjk00bsn21bpwi99q784ghr4wd")))) (build-system go-build-system) (arguments (list - #:test-flags #~(list "-skip" "TestFailoverHandler|TestLazy") - #:import-path "gopkg.in/inconshreveable/log15.v1")) + #:import-path "gopkg.in/inconshreveable/log15.v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-import-path + (lambda* (#:key tests? import-path #:allow-other-keys) + (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)) (home-page "https://pkg.go.dev/github.com/inconshreveable/log15") (synopsis "Structured, composable logging for Golang") (description @@ -23546,36 +23556,6 @@ machine readable. It is modeled after the Go standard library's @code{io} and @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)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "117ivm1asxw2hlwb3zf72q553ywjk00bsn21bpwi99q784ghr4wd")))) - (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 - (lambda* (#:key tests? import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (substitute* (find-files "." "\\.go$") - (("github.com/inconshreveable/log15") import-path)))))))) - (propagated-inputs - (list go-github-com-go-stack-stack - go-github-com-mattn-go-colorable - go-golang-org-x-term)))) - (define-public go-gopkg-in-inconshreveable-log15-v3 (package (inherit go-gopkg-in-inconshreveable-log15-v2)