gnu: yggdrasil: Update to 0.4.7.
* gnu/packages/networking.scm (yggdrasil): Update to 0.4.7. [arguments]: Use G-expressions. Set the package build name and version. Use go-1.20. [propagated-inputs]: Add go-golang-org-x-tools, go-github-com-olekukonko-tablewriter and go-github-com-mattn-go-colorable. * gnu/packages/patches/yggdrasil-extra-config.patch: Don't use deprecated "ioutil". Signed-off-by: Efraim Flashner <efraim@flashner.co.il>master
parent
81bbe95cd1
commit
7cd4103e81
|
@ -4378,7 +4378,7 @@ network.")
|
||||||
(define-public yggdrasil
|
(define-public yggdrasil
|
||||||
(package
|
(package
|
||||||
(name "yggdrasil")
|
(name "yggdrasil")
|
||||||
(version "0.4.3")
|
(version "0.4.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -4389,27 +4389,33 @@ network.")
|
||||||
(recursive? #t)))
|
(recursive? #t)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0jp6998a45xi8pbi8p84chvpm1mhhcvcxm1avi1c1gjjp4jqm3vl"))
|
(base32 "01mllfrsr55lnfivxwa57cfrjas6w4shsvx9k81pw8jixc124myk"))
|
||||||
(patches (search-patches "yggdrasil-extra-config.patch"))))
|
(patches (search-patches "yggdrasil-extra-config.patch"))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:import-path "github.com/yggdrasil-network/yggdrasil-go"
|
(list #:import-path "github.com/yggdrasil-network/yggdrasil-go"
|
||||||
;; TODO: figure out how tests are run
|
;; TODO: figure out how tests are run
|
||||||
#:tests? #f
|
#:tests? #f
|
||||||
#:install-source? #f
|
#:install-source? #f
|
||||||
#:phases
|
#:go go-1.20
|
||||||
(modify-phases %standard-phases
|
#:phases
|
||||||
(replace 'build
|
#~(modify-phases %standard-phases
|
||||||
(lambda* (#:key import-path build-flags #:allow-other-keys)
|
(replace 'build
|
||||||
(for-each
|
(lambda* (#:key import-path build-flags #:allow-other-keys)
|
||||||
(lambda (directory)
|
(let* ((pkgsrc "github.com/yggdrasil-network/yggdrasil-go/src/version")
|
||||||
((assoc-ref %standard-phases 'build)
|
(ldflags (format #f
|
||||||
#:build-flags build-flags
|
"-X ~a.buildName=yggdrasil -X ~a.buildVersion=~a"
|
||||||
#:import-path directory))
|
pkgsrc
|
||||||
(list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil"
|
pkgsrc
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl"
|
#$version)))
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys"))
|
(for-each
|
||||||
#t)))))
|
(lambda (directory)
|
||||||
|
((assoc-ref %standard-phases 'build)
|
||||||
|
#:build-flags `("-ldflags" ,ldflags)
|
||||||
|
#:import-path directory))
|
||||||
|
(list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil"
|
||||||
|
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl"
|
||||||
|
"github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys"))))))))
|
||||||
;; https://github.com/kardianos/minwinsvc is windows only
|
;; https://github.com/kardianos/minwinsvc is windows only
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list ;;("go-golang-zx2c4-com-wireguard-windows"
|
(list ;;("go-golang-zx2c4-com-wireguard-windows"
|
||||||
|
@ -4419,11 +4425,14 @@ network.")
|
||||||
go-golang-org-x-sys
|
go-golang-org-x-sys
|
||||||
go-golang-org-x-net
|
go-golang-org-x-net
|
||||||
go-golang-org-x-crypto
|
go-golang-org-x-crypto
|
||||||
|
go-golang-org-x-tools
|
||||||
go-netns
|
go-netns
|
||||||
go-netlink
|
go-netlink
|
||||||
|
go-github-com-olekukonko-tablewriter
|
||||||
go-github-com-mitchellh-mapstructure
|
go-github-com-mitchellh-mapstructure
|
||||||
go-github-com-mattn-go-runewidth
|
go-github-com-mattn-go-runewidth
|
||||||
go-github-com-mattn-go-isatty
|
go-github-com-mattn-go-isatty
|
||||||
|
go-github-com-mattn-go-colorable
|
||||||
go-github-com-kardianos-minwinsvc
|
go-github-com-kardianos-minwinsvc
|
||||||
go-github-com-hjson-hjson-go
|
go-github-com-hjson-hjson-go
|
||||||
go-github-com-hashicorp-go-syslog
|
go-github-com-hashicorp-go-syslog
|
||||||
|
|
|
@ -33,7 +33,7 @@ index 58b8230..b9df98a 100644
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
+ if extraconffile != "" {
|
+ if extraconffile != "" {
|
||||||
+ extraconf, err = ioutil.ReadFile(extraconffile);
|
+ extraconf, err = os.ReadFile(extraconffile);
|
||||||
+ }
|
+ }
|
||||||
+ if err != nil {
|
+ if err != nil {
|
||||||
+ panic(err)
|
+ panic(err)
|
||||||
|
|
Reference in New Issue