sharlatan pushed a commit to branch go-team
in repository guix.
commit 3cce66353586c3f87b1c0a6168f5be5c787fd47e
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Sat Sep 14 22:30:36 2024 +0100
gnu: go-github-com-go-git-go-billy: Rename variable.
* gnu/packages/golang.scm (go-github-com-go-git-go-billy): Rename
variable to go-github-com-go-git-go-billy-v5 to reflect go.mod import path.
* gnu/packages/golang-xyz.scm (go-github-com-go-git-go-git-fixtures-v4)
[propagated-inputs]: Remove go-github-com-go-git-go-billy; add
go-github-com-go-git-go-billy-v5.
* gnu/packages/version-control.scm (go-github-go-git): Likewise.
Change-Id: I49a776ba4db859bdebc1aa93cdf78e4c4903ed78
---
gnu/packages/golang-xyz.scm | 4 ++--
gnu/packages/golang.scm | 4 ++--
gnu/packages/version-control.scm | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index c7a9576337..93d91fe8bf 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1821,7 +1821,7 @@ metrics to Graphite.")
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/cyphar/filepath-securejoin")
+ (url "https://github.com/cyphar/filepatv-securejoin")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@@ -2923,7 +2923,7 @@ Differentiation between text and binary files}.
(native-inputs
(list go-github-com-stretchr-testify))
(propagated-inputs
- (list go-github-com-go-git-go-billy
+ (list go-github-com-go-git-go-billy-v5
go-gopkg-in-check-v1))
(home-page "https://github.com/go-git/go-git-fixtures/")
(synopsis "Fixtures used by @code{go-git}")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ba9971a373..677451c0d9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6029,9 +6029,9 @@ errors (warnings).")
(description "Gcfg reads INI-style configuration files into Go structs.")
(license license:bsd-3)))
-(define-public go-github-com-go-git-go-billy
+(define-public go-github-com-go-git-go-billy-v5
(package
- (name "go-github-com-go-git-go-billy")
+ (name "go-github-com-go-git-go-billy-v5")
(version "5.5.0")
(source (origin
(method git-fetch)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 6b6c6c5e15..79f7c17508 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3866,7 +3866,7 @@ defects faster.")
(list go-github-com-alcortesm-tgz
go-github-com-emirpasic-gods
go-github-com-go-git-gcfg
- go-github-com-go-git-go-billy
+ go-github-com-go-git-go-billy-v5
go-github-com-go-git-go-git-fixtures-v4
go-github-com-imdario-mergo
go-github-com-jbenet-go-context