diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 3482e327f7..36450ad70c 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -100,7 +100,7 @@ (define-public chezmoi go-github-com-spf13-viper go-github-com-stretchr-testify go-github-com-twpayne-go-shell - go-github-com-twpayne-go-vfs + go-github-com-twpayne-go-vfs-1.0.1 go-github-com-twpayne-go-vfsafero go-github-com-twpayne-go-xdg-v3 go-github-com-zalando-go-keyring diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index a6afad9a9f..b73f19ca0b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -13239,9 +13239,9 @@ (define-public go-github-com-twpayne-go-shell "Package @code{shell} returns a user's shell across multiple platforms.") (license license:expat))) -(define-public go-github-com-twpayne-go-vfs +(define-public go-github-com-twpayne-go-vfs-v5 (package - (name "go-github-com-twpayne-go-vfs") + (name "go-github-com-twpayne-go-vfs-v5") (version "5.0.4") (source (origin @@ -13255,7 +13255,7 @@ (define-public go-github-com-twpayne-go-vfs (build-system go-build-system) (arguments (list - #:import-path "github.com/twpayne/go-vfs" + #:import-path "github.com/twpayne/go-vfs/v5" #:phases #~(modify-phases %standard-phases ;; XXX: Replace when go-build-system supports nested path. @@ -13275,7 +13275,7 @@ (define-public go-github-com-twpayne-go-vfs ;; XXX: For chezmoi 1.8.10, remove it when updated. (define-public go-github-com-twpayne-go-vfs-1.0.1 - (hidden-package (package (inherit go-github-com-twpayne-go-vfs) + (hidden-package (package (inherit go-github-com-twpayne-go-vfs-v5) (name "go-github-com-twpayne-go-vfs") (version "1.0.1") (source @@ -13286,7 +13286,10 @@ (define-public go-github-com-twpayne-go-vfs-1.0.1 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1if2wfdwl3h8v8kgrgywkwcjafcz7hynq8ikr52s11qf2n0w3gny"))))))) + (base32 "1if2wfdwl3h8v8kgrgywkwcjafcz7hynq8ikr52s11qf2n0w3gny")))) + (arguments + (list + #:import-path "github.com/twpayne/go-vfs"))))) (define-public go-github-com-urfave-cli (package