gnu: Remove go-github-com-imdario-mergo.

* gnu/packages/golang.scm (go-github-com-imdario-mergo): Delete variable.
(go-dario-cat-mergo): Override go-github-com-imdario-mergo's package
definition instead of inherit it.
[source] <url>: Fix permament redirection
<https://github.com/imdario/mergo> -> <https://github.com/darccio/mergo>.
[native-inputs]: Remove go-gopkg-in-yaml-v2; add go-gopkg-in-yaml-v3.
[home-page]: Fix permament redirection
<https://github.com/imdario/mergo> -> <https://github.com/darccio/mergo>.

Change-Id: I612c7d028a92e877fd20900dffaba267405d99e6
This commit is contained in:
Sharlatan Hellseher 2025-01-08 14:31:48 +00:00
parent 4ca7437d6b
commit d78e300191
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5

View file

@ -3202,25 +3202,25 @@ Porter2 stemmer}. It is written completely using finite state machines to do
suffix comparison, rather than the string-based or tree-based approaches.") suffix comparison, rather than the string-based or tree-based approaches.")
(license license:asl2.0)))) (license license:asl2.0))))
(define-public go-github-com-imdario-mergo (define-public go-dario-cat-mergo
(package (package
(name "go-github-com-imdario-mergo") (name "go-dario-cat-mergo")
(version "0.3.10") (version "1.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/imdario/mergo") (url "https://github.com/darccio/mergo")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09h765p8yby9r8s0a3hv5kl8n2i382mda76wmvk48w1cc1w9s92p")))) "037k2bd97vnbyhn2sczxk0j6ijmv06n1282f76i3ky73s3qmqnlf"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/imdario/mergo")) `(#:import-path "dario.cat/mergo"))
(native-inputs (native-inputs
(list go-gopkg-in-yaml-v2)) (list go-gopkg-in-yaml-v3))
(home-page "https://github.com/imdario/mergo/") (home-page "https://github.com/darccio/mergo")
(synopsis "Helper to merge structs and maps in Golang") (synopsis "Helper to merge structs and maps in Golang")
(description "Helper to merge structs and maps in Golang. Useful for (description "Helper to merge structs and maps in Golang. Useful for
configuration default values, avoiding messy if-statements. configuration default values, avoiding messy if-statements.
@ -3231,27 +3231,6 @@ recursively any exported one. It also won't merge structs inside
maps (because they are not addressable using Go reflection).") maps (because they are not addressable using Go reflection).")
(license license:bsd-3))) (license license:bsd-3)))
(define-public go-dario-cat-mergo
(package
(inherit go-github-com-imdario-mergo)
(name "go-dario-cat-mergo")
(version "1.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/imdario/mergo")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"037k2bd97vnbyhn2sczxk0j6ijmv06n1282f76i3ky73s3qmqnlf"))))
(build-system go-build-system)
(arguments
`(#:unpack-path "dario.cat/mergo"
#:import-path "dario.cat/mergo"))
(native-inputs
(list go-gopkg-in-yaml-v3))))
(define-public go-github-com-olekukonko-ts (define-public go-github-com-olekukonko-ts
(let ((commit "78ecb04241c0121483589a30b0814836a746187d") (let ((commit "78ecb04241c0121483589a30b0814836a746187d")
(revision "0")) (revision "0"))