[bug#54335] [PATCH 00/14] gnu: Add nebula.

[bug#54335] [PATCH 00/14] gnu: Add nebula.

[Dominic Martinez]

This patch series adds Nebula, which is a scalable overlay networking tool
that uses certificates to securely create a peer-to-peer network. This is my
first big patch series, so let me know if something needs to change!

Dominic Martinez (14):
  gnu: Add go-github-com-anmitsu-go-shlex.
  gnu: Add go-github-com-armon-go-radix.
  gnu: Add go-github-com-cespare-xxhash-v2.
  gnu: Add go-github-com-cyberdelia-go-metrics-graphite.
  gnu: Add go-github-com-google-gopacket.
  gnu: Add go-github-com-miekg-dns.
  gnu: Add go-github-com-nbrownus-go-metrics-prometheus.
  gnu: Add go-github-com-songgao-water.
  gnu: Add go-github-com-vishvananda-netns.
  gnu: Add go-github-com-vishvananda-netlink.
  gnu: Add go-google-golang-org-protobuf.
  gnu: Add go-github-com-matttproud-golang-protobuf-extensions.
  gnu: Add go-github-com-skip2-go-qrcode.
  gnu: Add nebula.

 gnu/packages/golang.scm     | 353 ++++++++++++++++++++++++++++++++++++
 gnu/packages/networking.scm |  79 ++++++++
 2 files changed, 432 insertions(+)


base-commit: ae85a472687c3987ceac7e8cd6f793b59dc75403
-- 
2.34.0

[bug#54335] [PATCH 01/14] gnu: Add go-github-com-anmitsu-go-shlex.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-anmitsu-go-shlex): New variable.
---
 gnu/packages/golang.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7080bb6e24..7d796c7620 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9752,3 +9752,25 @@ (define-public go-github-com-go-chi-chi-v5
      "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
 decompose request handling into many smaller layers.")
     (license license:expat)))
+
+(define-public go-github-com-anmitsu-go-shlex
+  (package
+    (name "go-github-com-anmitsu-go-shlex")
+    (version "0.0.0-20200514113438-38f4b401e2be")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/anmitsu/go-shlex")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "17iz68yzbnr7y4s493asbagbv79qq8hvl2pkxvm6bvdkgphj8w1g"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/anmitsu/go-shlex"))
+    (home-page "https://github.com/anmitsu/go-shlex")
+    (synopsis "Simple shell-like lexical analyzer for Go")
+    (description
+      "@code{go-github-com-anmitsu-go-shlex} provides a simple lexical
+analysis like the Unix shell.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH 02/14] gnu: Add go-github-com-armon-go-radix.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-armon-go-radix): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7d796c7620..1a71b54d20 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9774,3 +9774,26 @@ (define-public go-github-com-anmitsu-go-shlex
       "@code{go-github-com-anmitsu-go-shlex} provides a simple lexical
 analysis like the Unix shell.")
     (license license:expat)))
+
+(define-public go-github-com-armon-go-radix
+  (package
+    (name "go-github-com-armon-go-radix")
+    (version "1.0.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/armon/go-radix")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1m1k0jz9gjfrk4m7hjm7p03qmviamfgxwm2ghakqxw3hdds8v503"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/armon/go-radix"))
+    (home-page "https://github.com/armon/go-radix")
+    (synopsis "Go implementation of Radix trees")
+    (description
+      "@code{go-github-com-armon-go-radix} implements a
+@url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.  The package only
+provides a single @code{Tree} implementation, optimized for sparse nodes.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH 03/14] gnu: Add go-github-com-cespare-xxhash-v2.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-cespare-xxhash-v2): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1a71b54d20..afa99d718e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9797,3 +9797,26 @@ (define-public go-github-com-armon-go-radix
 @url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.  The package only
 provides a single @code{Tree} implementation, optimized for sparse nodes.")
     (license license:expat)))
+
+(define-public go-github-com-cespare-xxhash-v2
+  (package
+    (name "go-github-com-cespare-xxhash-v2")
+    (version "2.1.2")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/cespare/xxhash")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/cespare/xxhash/v2"))
+    (home-page "https://github.com/cespare/xxhash")
+    (synopsis "Go implementation of the 64-bit xxHash algorithm (XXH64)")
+    (description
+      "@code{go-github-com-cespare-xxhash-v2} implements the 64-bit variant of
+xxHash (XXH64) as described at
+@url{http://cyan4973.github.io/xxHash/,http://cyan4973.github.io/xxHash/}.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH 03/14] gnu: Add go-github-com-cespare-xxhash-v2.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:18 [-0500]:
> +(define-public go-github-com-cespare-xxhash-v2
> +  (package
> +    (name "go-github-com-cespare-xxhash-v2")

Isn't this just an updated version of 'go-github-com-cespare-xxhash'
from 2.1.0 to 2.1.2?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 04/14] gnu: Add go-github-com-cyberdelia-go-metrics-graphite.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-cyberdelia-go-metrics-graphite): New variable.
---
 gnu/packages/golang.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index afa99d718e..6eecdbe48e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9820,3 +9820,33 @@ (define-public go-github-com-cespare-xxhash-v2
 xxHash (XXH64) as described at
 @url{http://cyan4973.github.io/xxHash/,http://cyan4973.github.io/xxHash/}.")
     (license license:expat)))
+
+(define-public go-github-com-cyberdelia-go-metrics-graphite
+  (package
+    (name "go-github-com-cyberdelia-go-metrics-graphite")
+    (version "0.0.0-20161219230853-39f87cc3b432")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/cyberdelia/go-metrics-graphite")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1nnpwryw8i110laffyavvhx38gcd1jnpdir69y6fxxzpx06d094w"))))
+    (build-system go-build-system)
+    (propagated-inputs
+     (list go-github-com-rcrowley-go-metrics))
+    (arguments
+     '(#:import-path "github.com/cyberdelia/go-metrics-graphite"
+       ;; Tests use network
+       #:tests? #f))
+    (home-page "https://github.com/cyberdelia/go-metrics-graphite")
+    (synopsis "Graphite client for go-metrics")
+    (description
+      "This is a reporter for the
+@url{https://github.com/rcrowley/go-metrics,go-metrics} library which will post
+the metrics to Graphite.  It was originally part of the @code{go-metrics}
+library itself, but has been split off to make maintenance of both the core
+library and the client easier.")
+    (license license:bsd-2)))
-- 
2.34.0

[bug#54335] [PATCH 05/14] gnu: Add go-github-com-google-gopacket.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-google-gopacket): New variable
---
 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6eecdbe48e..b1f23b7eac 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9850,3 +9850,27 @@ (define-public go-github-com-cyberdelia-go-metrics-graphite
 library itself, but has been split off to make maintenance of both the core
 library and the client easier.")
     (license license:bsd-2)))
+
+(define-public go-github-com-google-gopacket
+  (package
+    (name "go-github-com-google-gopacket")
+    (version "1.1.19")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/google/gopacket")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "048qwm2n0wrpql4qqgd7jyynn3gk069yvqbxnshlayzmbhf87ls4"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/google/gopacket"))
+    (native-inputs
+      (list go-golang-org-x-sys go-golang-org-x-net go-golang-org-x-lint))
+    (home-page "https://github.com/google/gopacket")
+    (synopsis "Provides packet processing capabilities for Go")
+    (description
+      "@code{go-github-com-google-gopacket} provides packet decoding for the
+Go language.")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH 06/14] gnu: Add go-github-com-miekg-dns.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-miekg-dns): New variable.
---
 gnu/packages/golang.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b1f23b7eac..d0b5041a8b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9874,3 +9874,32 @@ (define-public go-github-com-google-gopacket
       "@code{go-github-com-google-gopacket} provides packet decoding for the
 Go language.")
     (license license:bsd-3)))
+
+(define-public go-github-com-miekg-dns
+  (package
+    (name "go-github-com-miekg-dns")
+    (version "1.1.46")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/miekg/dns")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "135hnwz3gphgdhs3cs07bvlvbc8k5lh3a75nwkyvl3ylnlf0mpnp"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/miekg/dns"))
+    (native-inputs
+     (list go-golang-org-x-tools
+           go-golang-org-x-sys
+           go-golang-org-x-sync
+           go-golang-org-x-net))
+    (home-page "https://github.com/miekg/dns")
+    (synopsis "Alternative (more granular) approach to a DNS library")
+    (description
+      "@code{go-github-com-miekg-dns} implements a full featured interface to
+the Domain Name System.  Both server and client side programming is supported.
+The package allows complete control over what is sent out to the DNS.  The API
+follows the less-is-more principle, by presenting a small, clean interface.")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH 07/14] gnu: Add go-github-com-nbrownus-go-metrics-prometheus.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-nbrownus-go-metrics-prometheus): New
variable.
---
 gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d0b5041a8b..20523d9a13 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9903,3 +9903,31 @@ (define-public go-github-com-miekg-dns
 The package allows complete control over what is sent out to the DNS.  The API
 follows the less-is-more principle, by presenting a small, clean interface.")
     (license license:bsd-3)))
+
+(define-public go-github-com-nbrownus-go-metrics-prometheus
+  (package
+    (name "go-github-com-nbrownus-go-metrics-prometheus")
+    (version "0.0.0-20210712211119-974a6260965f")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/nbrownus/go-metrics-prometheus")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1kl9l08aas544627zmhkgp843qx94sxs4inxm20nw1hx7gp79dz0"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/nbrownus/go-metrics-prometheus"))
+    (native-inputs
+     (list go-github-com-stretchr-testify
+           go-github-com-rcrowley-go-metrics
+           go-github-com-prometheus-client-golang))
+    (home-page "https://github.com/nbrownus/go-metrics-prometheus")
+    (synopsis "Prometheus support for go-metrics")
+    (description
+      "@code{go-github-com-nbrownus-go-metrics-prometheus} is a reporter for
+the go-metrics library which will post the metrics to the prometheus client
+registry.  It just updates the registry, taking care of exporting the metrics
+is still your responsibility.")
+    (license license:asl2.0)))
-- 
2.34.0

[bug#54335] [PATCH 07/14] gnu: Add go-github-com-nbrownus-go-metrics-prometheus.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:18 [-0500]:
> +(define-public go-github-com-nbrownus-go-metrics-prometheus
> +  (package
> +    (name "go-github-com-nbrownus-go-metrics-prometheus")
> +    (version "0.0.0-20210712211119-974a6260965f")
> +    (source
> +      (origin
> +        (method git-fetch)
> +        (uri (git-reference
> +               (url "https://github.com/nbrownus/go-metrics-prometheus")

Why use a fork instead of the upstream
<https://github.com/deathowl/go-metrics-prometheus>?  If the fork is
actually necessary (e.g. extra features), could you add a link to the
pull request upstream merging the nbrownus fork back into deathowl?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 07/14] gnu: Add go-github-com-nbrownus-go-metrics-prometheus.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> Why use a fork instead of the upstream
> <https://github.com/deathowl/go-metrics-prometheus>?  If the 
> fork is
> actually necessary (e.g. extra features), could you add a link 
> to the
> pull request upstream merging the nbrownus fork back into 
> deathowl?

I couldn't find an instance of the features in the fork being 
used, but Nebula specifically uses that fork. Are you suggesting 
patching the source to import the upstream instead?


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 08/14] gnu: Add go-github-com-songgao-water.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-songgao-water): New variable.
---
 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 20523d9a13..a58b404079 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9931,3 +9931,27 @@ (define-public go-github-com-nbrownus-go-metrics-prometheus
 registry.  It just updates the registry, taking care of exporting the metrics
 is still your responsibility.")
     (license license:asl2.0)))
+
+(define-public go-github-com-songgao-water
+  (package
+    (name "go-github-com-songgao-water")
+    (version "0.0.0-20200317203138-2b4b6d7c09d8")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/songgao/water")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1k5aildfszp6x66jzar4y36lic8ijkb5020hfaivpvq3bnwdiikl"))))
+    (build-system go-build-system)
+    (arguments '(#:tests? #f ; Tests require network access
+                 #:import-path "github.com/songgao/water"))
+    (home-page "https://github.com/songgao/water")
+    (synopsis "Simple network tunnel/tap library")
+    (description
+      "@code{go-github-com-songgao-water} is a simple TUN/TAP interface
+library for Go that efficiently works with standard packages like io, bufio,
+etc..  Use waterutil with it to work with TUN/TAP packets/frames.")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH 09/14] gnu: Add go-github-com-vishvananda-netns.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-vishvananda-netns): New variable.
---
 gnu/packages/golang.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a58b404079..bcf50439c7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9955,3 +9955,33 @@ (define-public go-github-com-songgao-water
 library for Go that efficiently works with standard packages like io, bufio,
 etc..  Use waterutil with it to work with TUN/TAP packets/frames.")
     (license license:bsd-3)))
+
+(define-public go-github-com-vishvananda-netns
+  (package
+    (name "go-github-com-vishvananda-netns")
+    (version "0.0.0-20211101163701-50045581ed74")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/vishvananda/netns")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "0kam780m036mk77fmc0w0z6qz4b5awkllcd1dps71zd1n82mr407"))))
+    (build-system go-build-system)
+    (arguments '(#:tests? #f ; Tests require root privileges
+                 #:import-path "github.com/vishvananda/netns"))
+    (native-inputs
+     (list go-golang-org-x-sys))
+    (home-page "https://github.com/vishvananda/netns")
+    (synopsis "Simple network namespace handling for Go")
+    (description
+      "Package netns allows ultra-simple network namespace handling.  NsHandles can be
+retrieved and set.  Note that the current namespace is thread local so actions
+that set and reset namespaces should use LockOSThread to make sure the namespace
+doesn't change due to a goroutine switch.  It is best to close NsHandles when
+you are done with them.  This can be accomplished via a `defer ns.Close()` on
+the handle.  Changing namespaces requires elevated privileges, so in most cases
+this code needs to be run as root.")
+    (license license:asl2.0)))
-- 
2.34.0

[bug#54335] [PATCH 09/14] gnu: Add go-github-com-vishvananda-netns.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:18 [-0500]:
> +    (arguments '(#:tests? #f ; Tests require root privileges

Is this still the case?  Nowadays, some namespace stuff can be done
without root.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 09/14] gnu: Add go-github-com-vishvananda-netns.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:18 [-0500]:
> * gnu/packages/golang.scm (go-github-com-vishvananda-netns): New variable.

This is already packaged in Guix (go-netns).

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 09/14] gnu: Add go-github-com-vishvananda-netns.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> This is already packaged in Guix (go-netns).

This and netlink were my bad; thank you for pointing that out!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 10/14] gnu: Add go-github-com-vishvananda-netlink.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-vishvananda-netlink): New variable.
---
 gnu/packages/golang.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 24585e447e..5070981cfd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9986,3 +9986,34 @@ (define-public go-github-com-vishvananda-netns
 the handle.  Changing namespaces requires elevated privileges, so in most cases
 this code needs to be run as root.")
     (license license:asl2.0)))
+
+(define-public go-github-com-vishvananda-netlink
+  (package
+    (name "go-github-com-vishvananda-netlink")
+    (version "1.1.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/vishvananda/netlink")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1vhl30p1gx636a088ls4h6a0l8jjyfvz79fr5w0qzdrg4qg9h08h"))))
+    (build-system go-build-system)
+    (arguments '(#:tests? #f
+                 #:import-path "github.com/vishvananda/netlink"))
+    (native-inputs
+     (list go-golang-org-x-sys
+           go-github-com-vishvananda-netns))
+    (home-page "https://github.com/vishvananda/netlink")
+    (synopsis "Netlink library for Go")
+    (description
+      "Package netlink provides a simple library for netlink.  Netlink is the interface
+a user-space program in linux uses to communicate with the kernel.  It can be
+used to add and remove interfaces, set up ip addresses and routes, and confiugre
+ipsec.  Netlink communication requires elevated privileges, so in most cases
+this code needs to be run as root.  The low level primitives for netlink are
+contained in the nl subpackage.  This package attempts to provide a high-level
+interface that is loosly modeled on the iproute2 cli.")
+    (license license:asl2.0)))
-- 
2.34.0

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Dominic Martinez]

* gnu/packages/golang.scm (go-google-golang-org-protobuf): New variable.
---
 gnu/packages/golang.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5070981cfd..bac9dda1f7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10017,3 +10017,42 @@ (define-public go-github-com-vishvananda-netlink
 contained in the nl subpackage.  This package attempts to provide a high-level
 interface that is loosly modeled on the iproute2 cli.")
     (license license:asl2.0)))
+
+(define-public go-google-golang-org-protobuf
+  (package
+    (name "go-google-golang-org-protobuf")
+    (version "1.27.1")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://go.googlesource.com/protobuf")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "0aszb7cv8fq1m8akgd4kjyg5q7g5z9fdqnry6057ygq9r8r2yif2"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "google.golang.org/protobuf"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; Source-only package
+         (delete 'build))))
+    (native-inputs
+      (list go-github-com-google-go-cmp-cmp))
+    (home-page "https://google.golang.org/protobuf")
+    (synopsis "Go support for Protocol Buffers")
+    (description
+      "This project hosts the Go implementation for
+@url{https://developers.google.com/protocol-buffers,protocol buffers}, which is
+a language-neutral, platform-neutral, extensible mechanism for serializing
+structured data.  The protocol buffer language is a language for specifying the
+schema for structured data.  This schema is compiled into language specific
+bindings.  This project provides both a tool to generate Go code for the
+protocol buffer language, and also the runtime implementation to handle
+serialization of messages in Go.  See the
+@url{https://developers.google.com/protocol-buffers/docs/overview,protocol
+buffer developer guide} for more information about protocol buffers themselves.")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +(define-public go-google-golang-org-protobuf
> +  (package
> +    (name "go-google-golang-org-protobuf")

A presumably compatible package is already packaged:
'go-github-com-gogo-protobuf'.  Perhaps that package suffices?

Also, what's the difference with 'go-github-com-golang-protobuf-proto',
besides the unimportant difference in repository location?

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 840 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

>> +(define-public go-google-golang-org-protobuf
>> +  (package
>> +    (name "go-google-golang-org-protobuf")
>
> A presumably compatible package is already packaged:
> 'go-github-com-gogo-protobuf'.  Perhaps that package suffices?

Annoyingly, the upstream Nebula source actively uses both 
go-github-com-gogo-protobuf and go-google-golang-org-protobuf, and 
they are not interchangeable.

> Also, what's the difference with 
> 'go-github-com-golang-protobuf-proto',
> besides the unimportant difference in repository location?

go-github-com-golang-protobuf-proto was superceded by 
go-google-golang-org-protobuf. Per the repo, 
go-google-golang-org-protobuf contains "an updated and simplified 
API, support for protobuf reflection, and many other improvements"

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 578 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +     '(#:import-path "google.golang.org/protobuf"
> +       ;; Source-only package
> +       #:tests? #f

What has source code to do with tests?  Tests can be in the form of
pre-compiled binaries, and tests are usually a part of the source code.

Also, there do appear to be a few tests, e.g. at
<https://github.com/protocolbuffers/protobuf-go/blob/3992ea83a23c00882339f33511074d251e19822c/testing/protocmp/util_test.go#L23>.

I don't know how to run them though.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

>> +     '(#:import-path "google.golang.org/protobuf"
>> +       ;; Source-only package
>> +       #:tests? #f
>
> What has source code to do with tests?  Tests can be in the form 
> of
> pre-compiled binaries, and tests are usually a part of the 
> source code.

I'm following the lead of other source-only Go packages which also 
disable tests.

> I don't know how to run them though.

This is the issue I ran into; Guix seems to expect a build output 
to run tests on.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +       (modify-phases %standard-phases
> +         ;; Source-only package
> +         (delete 'build))))

Why is the build phase removed?  It seems to be just a Go library,
not some Rust-style circularity.

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

>> +       (modify-phases %standard-phases
>> +         ;; Source-only package
>> +         (delete 'build))))
>
> Why is the build phase removed?  It seems to be just a Go 
> library,
> not some Rust-style circularity.

As far as I can tell Go expects libraries to be source-only, so 
I'm not sure what you would do in a build phase. I followed the 
lead of the other Go library packages like go-golang-org-x-tools 
(grep golang.scm for "Source-only package").


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

Dominic Martinez schreef op vr 11-03-2022 om 15:32 [-0500]:
> As far as I can tell Go expects libraries to be source-only, so 
> I'm not sure what you would do in a build phase. I followed the 
> lead of the other Go library packages like go-golang-org-x-tools 
> (grep golang.scm for "Source-only package").

FWIW, there exist Go libraries that keep the default build phase,
e.g. go-github-com-hashicorp-go-version.  Also, according
to comments in guix/build/go-build-system.scm, it is intended to
someday reuse the compiled build dependencies again (see
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32919>).

Also, perhaps the 'build' phase is currently largely useless for Go
libraries, I'd expect it to be a no-op in those cases, so I don't
expect it to be necessary to delete the build phase.

I expect that existing instances of (delete 'build) in golang.scm can
be removed, but it's not something I've ever actually tried, so I'm
not sure.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 11/14] gnu: Add go-google-golang-org-protobuf.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +       #:tests? #f

I see a test in
<https://github.com/protocolbuffers/protobuf-go/blob/master/test.bash>.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 12/14] gnu: Add go-github-com-matttproud-golang-protobuf-extensions.

[Dominic Martinez]

* gnu/packages/golang.scm
(go-github-com-matttproud-golang-protobuf-extensions): New variable
---
 gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bac9dda1f7..7e316a2552 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10056,3 +10056,30 @@ (define-public go-google-golang-org-protobuf
 @url{https://developers.google.com/protocol-buffers/docs/overview,protocol
 buffer developer guide} for more information about protocol buffers themselves.")
     (license license:bsd-3)))
+
+(define-public go-github-com-matttproud-golang-protobuf-extensions
+  (package
+    (name "go-github-com-matttproud-golang-protobuf-extensions")
+    (version "1.0.1")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/matttproud/golang_protobuf_extensions")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/matttproud/golang_protobuf_extensions/pbutil"
+       #:unpack-path "github.com/matttproud/golang_protobuf_extensions"))
+    (propagated-inputs
+     (list go-github-com-golang-protobuf-proto))
+    (home-page "https://github.com/matttproud/golang_protobuf_extensions")
+    (synopsis "Go support for streaming Protocol Buffer messages")
+    (description
+      "@code{go-github-com-matttproud-golang-protobuf-extensions} provides
+various Protocol Buffer extensions for the Go language, namely support for
+record length-delimited message streaming.")
+    (license license:asl2.0)))
-- 
2.34.0

[bug#54335] [PATCH 13/14] gnu: Add go-github-com-skip2-go-qrcode.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-skip2-go-qrcode): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7e316a2552..c964832e94 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10083,3 +10083,26 @@ (define-public go-github-com-matttproud-golang-protobuf-extensions
 various Protocol Buffer extensions for the Go language, namely support for
 record length-delimited message streaming.")
     (license license:asl2.0)))
+
+(define-public go-github-com-skip2-go-qrcode
+  (package
+    (name "go-github-com-skip2-go-qrcode")
+    (version "0.0.0-20200617195104-da1b6568686e")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/skip2/go-qrcode")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "0pghd6y2x8a5fqy4rjn4d8j5jcslb236naycdza5an7vyvinsgs9"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/skip2/go-qrcode"
+                 ;; Tests failing
+                 #:tests? #f))
+    (home-page "https://github.com/skip2/go-qrcode")
+    (synopsis "QR code encoder")
+    (description "@code{go-github-com-skip2-go-qrcode} provides a QR code
+encoder for the Go language.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH 13/14] gnu: Add go-github-com-skip2-go-qrcode.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +                 ;; Tests failing

Then the issue identified by the failing tests should be reported
upstream and ideally fixed.  Otherwise, what's the point of tests?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 13/14] gnu: Add go-github-com-skip2-go-qrcode.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

>> +                 ;; Tests failing
>
> Then the issue identified by the failing tests should be 
> reported
> upstream and ideally fixed.  Otherwise, what's the point of 
> tests?

I'll work on getting these tests fixed!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 13/14] gnu: Add go-github-com-skip2-go-qrcode.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +    (home-page "https://github.com/skip2/go-qrcode")

According to that page, the home page is at
<http://go-qrcode.appspot.com/>, not GitHub.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 13/14] gnu: Add go-github-com-skip2-go-qrcode.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

>> +    (home-page "https://github.com/skip2/go-qrcode")
>
> According to that page, the home page is at
> <http://go-qrcode.appspot.com/>, not GitHub.

That's my bad; thank you!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 13/14] gnu: Add go-github-com-skip2-go-qrcode.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> According to that page, the home page is at
> <http://go-qrcode.appspot.com/>, not GitHub.

Actually, looking closer, that link is just a demo (and also 
appears to not work). Would the github still be a better homepage 
in this case?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 13/14] gnu: Add go-github-com-skip2-go-qrcode.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 397 bytes --]

Dominic Martinez schreef op vr 11-03-2022 om 15:49 [-0500]:
> Maxime Devos <maximedevos@telenet.be> writes:
> 
> > According to that page, the home page is at
> > <http://go-qrcode.appspot.com/>, not GitHub.
> 
> Actually, looking closer, that link is just a demo (and also 
> appears to not work). Would the github still be a better homepage 
> in this case?

Sounds reasonable to me.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Dominic Martinez]

* gnu/packages/networking.scm (nebula): New variable.
---
 gnu/packages/networking.scm | 80 +++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b45f2f79f2..ab5be17241 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -48,6 +48,7 @@
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Simon South <simon@simonsouth.net>
+;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -140,6 +141,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages syncthing)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages textutils)
@@ -4191,3 +4193,81 @@ (define-public putty
 implementations.")
     (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/")
     (license license:expat)))
+
+(define-public nebula
+  ;; NOTE: does not include nebula-service, which is incompatible with
+  ;; Shepherd.
+  (package
+    (name "nebula")
+    (version "1.5.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/slackhq/nebula")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "14b7wgx83w1fhcbhsn0mfg872hkml4wwbzimb3bjvc3xpzx6w44k"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/slackhq/nebula"
+       #:install-source? #f
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'build
+           (lambda _
+             ;; Build nebula and nebula cert
+             (let* ((dir "github.com/slackhq/nebula")
+                    (nebula-cmd (string-append dir "/cmd/nebula"))
+                    (cert-cmd (string-append dir "/cmd/nebula-cert")))
+               (invoke "go" "build" nebula-cmd)
+               (invoke "go" "build" cert-cmd))))
+
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bindir (string-append out "/bin")))
+               (install-file "nebula" bindir)
+               (install-file "nebula-cert" bindir)))))))
+    (native-inputs
+     (list go-gopkg-in-yaml-v3
+           go-golang-org-x-term
+           go-github-com-prometheus-common
+           go-github-com-pmezard-go-difflib
+           go-github-com-matttproud-golang-protobuf-extensions
+           go-github-com-davecgh-go-spew
+           go-gopkg-in-yaml-v2
+           go-google-golang-org-protobuf
+           go-golang-org-x-sys
+           go-golang-org-x-net
+           go-golang-org-x-crypto
+           go-github-com-vishvananda-netns
+           go-github-com-vishvananda-netlink
+           go-github-com-skip2-go-qrcode
+           go-github-com-stretchr-testify
+           go-github-com-songgao-water
+           go-github-com-sirupsen-logrus
+           go-github-com-rcrowley-go-metrics
+           go-github-com-prometheus-procfs
+           go-github-com-prometheus-client-model
+           go-github-com-prometheus-client-golang
+           go-github-com-nbrownus-go-metrics-prometheus
+           go-github-com-miekg-dns
+           go-github-com-imdario-mergo
+           go-github-com-google-gopacket
+           go-github-com-gogo-protobuf
+           go-github-com-flynn-noise
+           go-github-com-cyberdelia-go-metrics-graphite
+           go-github-com-cespare-xxhash-v2
+           go-github-com-armon-go-radix
+           go-github-com-anmitsu-go-shlex))
+    (home-page "https://github.com/slackhq/nebula")
+    (synopsis "Scalable overlay networking tool")
+    (description
+     "Nebula is a scalable overlay networking tool with a focus on performance,
+simplicity and security.  It lets you seamlessly connect computers anywhere in
+the world.  Nebula is portable, and runs on Linux, OSX, Windows, iOS, and
+Android.  It can be used to connect a small number of computers, but is also
+able to connect tens of thousands of computers.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1943 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +    (native-inputs
> +     (list go-gopkg-in-yaml-v3
> +           go-golang-org-x-term
> +           go-github-com-prometheus-common
> +           go-github-com-pmezard-go-difflib
> +           go-github-com-matttproud-golang-protobuf-extensions
> +           go-github-com-davecgh-go-spew
> +           go-gopkg-in-yaml-v2
> +           go-google-golang-org-protobuf
> +           go-golang-org-x-sys
> +           go-golang-org-x-net
> +           go-golang-org-x-crypto
> +           go-github-com-vishvananda-netns
> +           go-github-com-vishvananda-netlink
> +           go-github-com-skip2-go-qrcode
> +           go-github-com-stretchr-testify
> +           go-github-com-songgao-water
> +           go-github-com-sirupsen-logrus
> +           go-github-com-rcrowley-go-metrics
> +           go-github-com-prometheus-procfs
> +           go-github-com-prometheus-client-model
> +           go-github-com-prometheus-client-golang
> +           go-github-com-nbrownus-go-metrics-prometheus
> +           go-github-com-miekg-dns
> +           go-github-com-imdario-mergo
> +           go-github-com-google-gopacket
> +           go-github-com-gogo-protobuf
> +           go-github-com-flynn-noise
> +           go-github-com-cyberdelia-go-metrics-graphite
> +           go-github-com-cespare-xxhash-v2
> +           go-github-com-armon-go-radix
> +           go-github-com-anmitsu-go-shlex))

I doubt that all of these are compile-time tools.  At least most of
them are probably inputs.  (The distinction is important for cross-
compilation.)

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> I doubt that all of these are compile-time tools.  At least most 
> of
> them are probably inputs.  (The distinction is important for 
> cross-
> compilation.)

I think I'm confused on how to approach this because Go produces 
statically linked binaries. A lot of other Go packages also seem 
to use native-inputs. How does this interact with 
cross-compilation? All the inputs are used as source libraries 
here so I'm not sure how to tell if a runtime input is needed.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1866 bytes --]

Dominic Martinez schreef op vr 11-03-2022 om 15:53 [-0500]:
> Maxime Devos <maximedevos@telenet.be> writes:
> 
> > I doubt that all of these are compile-time tools.  At least most 
> > of
> > them are probably inputs.  (The distinction is important for 
> > cross-
> > compilation.)
> 
> I think I'm confused on how to approach this because Go produces 
> statically linked binaries. A lot of other Go packages also seem 
> to use native-inputs. How does this interact with 
> cross-compilation? All the inputs are used as source libraries 
> here so I'm not sure how to tell if a runtime input is needed.

Static linking is not relevant to inputs/native-inputs -- Guix inputs
don't have a build-time/runtime distinction (*), instead they have a
the-architecture-it-is-being-built-on/the-architecture-it-is-built-for
distinction.  'inputs' = compiled for --target, 'native-inputs' =
compiled for --system.

(*) ignoring complications introduced by propagation.

More concretely, consider the following case:

  * a program A depends on the Go library B
  * the Go library B depends on the C library libfoo (using whatever is
    Go's equivalent of 'dlopen')
  * to avoid things like LD_LIBRARY_PATH, the package definition in
    Guix replaces 'libfoo.so' by '/gnu/store/.../libfoo.so'.
  * the program A is being cross-compiled.

To make sure that the cross-compiled A ends up using the libfoo.so
compiled for --target instead of --system, B has to be in 'inputs'
instead of 'native-inputs'.

This also holds when no .so libraries are used, e.g. if B invokes some
kind of binary with Go's equivalent of 'posix_spawn' and Guix hardcodes
the binary location instead of relying on $PATH.

I haven't tried this for Go packages in particular, but this is how
things work for, say, C and Guile packages.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +  ;; NOTE: does not include nebula-service, which is incompatible with
> +  ;; Shepherd.

What does this mean?  Do you mean there's no corresponding Shepherd
service?  If so, perhaps people can still run the 'nebula-service'
binary directly?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 701 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

>> +  ;; NOTE: does not include nebula-service, which is 
>> incompatible with
>> +  ;; Shepherd.
>
> What does this mean?  Do you mean there's no corresponding 
> Shepherd
> service?  If so, perhaps people can still run the 
> 'nebula-service'
> binary directly?

Sorry, that was confusing. The nebula-service tool is used for 
setting up auto-start on multiple platforms. It's mainly useful on 
Windows and Mac as it's more difficult to create services on those 
platforms. I didn't think it was especially useful to include as 
on Linux it just creates a simple systemd service, and naturally 
can't create a shepherd service


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]

Dominic Martinez schreef op vr 11-03-2022 om 16:02 [-0500]:
> Maxime Devos <maximedevos@telenet.be> writes:
> 
> > > +  ;; NOTE: does not include nebula-service, which is 
> > > incompatible with
> > > +  ;; Shepherd.
> > 
> > What does this mean?  Do you mean there's no corresponding 
> > Shepherd
> > service?  If so, perhaps people can still run the 
> > 'nebula-service'
> > binary directly?
> 
> Sorry, that was confusing. The nebula-service tool is used for 
> setting up auto-start on multiple platforms. It's mainly useful on 
> Windows and Mac as it's more difficult to create services on those 
> platforms. I didn't think it was especially useful to include as 
> on Linux it just creates a simple systemd service, and naturally 
> can't create a shepherd service

Ok that does indeed sound like something that is unlikely to work in
Guix, though keep in mind that Guix can be used on top of other
distros, possibly distros using SystemD (e.g. this mail is composed on
Debian+Guix), so it might be useful after all, though I don't consider
it in any way essential.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]


Also, thank you so much for the very thorough review! This is 
pretty much my first big open-source contribution, so it's very 
helpful to get all the feedback :).


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +     "Nebula is a scalable overlay networking tool with a focus on performance,
> +simplicity and security.  It lets you seamlessly connect computers anywhere in
> +the world.  Nebula is portable, and runs on Linux, OSX, Windows, iOS, and
> +Android.

Android is just a form of Linux with an unusual userspace, so no need
to mention it here.  Also,

>   It can be used to connect a small number of computers, but is also
> +able to connect tens of thousands of computers.")

This description reads like marketing talk (unqualified ‘seamless’,
‘performance’, ‘simplicity’, ‘security’).  The seamless seems factually
incorrect, since there is not corresponding Shepherd service.
 
As requested in (guix)Synopses and Descriptions, could the marketing be
left out, instead staying factual and descriptive?

E.g., you could look at the descriptions of 'yggdrasil', 'gnunet', 'go-
ipfs' and 'wireguard' and see if some things could be reused, or if
some things are out-of-scope or missing in Nebula and mention that.

Also, there are some binaries in 'dist/windows/wintun' -- even non-
free!

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 14/14] gnu: Add nebula.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> This description reads like marketing talk (unqualified 
> ‘seamless’,
> ‘performance’, ‘simplicity’, ‘security’).  The seamless seems 
> factually
> incorrect, since there is not corresponding Shepherd service.
>
> As requested in (guix)Synopses and Descriptions, could the 
> marketing be
> left out, instead staying factual and descriptive?
>
> E.g., you could look at the descriptions of 'yggdrasil', 
> 'gnunet', 'go-
> ipfs' and 'wireguard' and see if some things could be reused, or 
> if
> some things are out-of-scope or missing in Nebula and mention 
> that.

Sure thing; I used the upstream description, so I'll write my own 
more consistent with Guix's guidelines.

> Also, there are some binaries in 'dist/windows/wintun' -- even 
> non-
> free!

Oh shoot! I removed the wintun and wireguard Windows dependencies 
but it looks like some Windows code still snuck in somewhere; I'll 
patch that out.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 10/14] gnu: Add go-github-com-vishvananda-netlink.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 128 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> +    (arguments '(#:tests? #f

Why?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 10/14] gnu: Add go-github-com-vishvananda-netlink.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:47 [-0500]:
> * gnu/packages/golang.scm (go-github-com-vishvananda-netlink): New variable.
> ---
>  gnu/packages/golang.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index 24585e447e..5070981cfd 100644
> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm
> @@ -9986,3 +9986,34 @@ (define-public go-github-com-vishvananda-netns
>  the handle.  Changing namespaces requires elevated privileges, so in most cases
>  this code needs to be run as root.")
>      (license license:asl2.0)))
> +
> +(define-public go-github-com-vishvananda-netlink

This is already packaged in Guix, see 'go-netlink'.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH v2 01/14] gnu: Add go-github-com-anmitsu-go-shlex.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-anmitsu-go-shlex): New variable.
---
Oops, I didn't add the copyright in the first patch; here's a v2.

 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7080bb6e24..4a3c318507 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2021 Chadwain Holness <chadwainholness@gmail.com>
 ;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
 ;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
+;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -9752,3 +9753,25 @@ (define-public go-github-com-go-chi-chi-v5
      "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
 decompose request handling into many smaller layers.")
     (license license:expat)))
+
+(define-public go-github-com-anmitsu-go-shlex
+  (package
+    (name "go-github-com-anmitsu-go-shlex")
+    (version "0.0.0-20200514113438-38f4b401e2be")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/anmitsu/go-shlex")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "17iz68yzbnr7y4s493asbagbv79qq8hvl2pkxvm6bvdkgphj8w1g"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/anmitsu/go-shlex"))
+    (home-page "https://github.com/anmitsu/go-shlex")
+    (synopsis "Simple shell-like lexical analyzer for Go")
+    (description
+      "@code{go-github-com-anmitsu-go-shlex} provides a simple lexical
+analysis like the Unix shell.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH 00/14] gnu: Add nebula.

[Ludovic Courtès]

Hi Dominic,

This series looks almost ready to go.  Could you send a v2 (“v3”?)
incorporating some of the changes that Maxime suggested?

In particular, Maxime noted that ‘go-github-com-vishvananda-netlink’ is
redundant with ‘go-netlink’, that there are occurrences of #:tests? #f
that would need a comment next to them explaining why the test suite is
skipped, and some descriptions could be improved a bit.  (I might have
missed other comments.)

Could you take a look?

Thanks in advance, and thanks for this pretty big contribution!

Ludo’.

[bug#54335] [PATCH 00/14] gnu: Add nebula.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 830 bytes --]

Hi Ludovic,

Sure thing; I'm pretty busy at the moment, but I'll send a revised 
patch as soon as I have some time. Thank you for all your help 
with Guix!

Ludovic Courtès <ludo@gnu.org> writes:

> Hi Dominic,
>
> This series looks almost ready to go.  Could you send a v2 
> (“v3”?)
> incorporating some of the changes that Maxime suggested?
>
> In particular, Maxime noted that 
> ‘go-github-com-vishvananda-netlink’ is
> redundant with ‘go-netlink’, that there are occurrences of 
> #:tests? #f
> that would need a comment next to them explaining why the test 
> suite is
> skipped, and some descriptions could be improved a bit.  (I 
> might have
> missed other comments.)
>
> Could you take a look?
>
> Thanks in advance, and thanks for this pretty big contribution!
>
> Ludo’.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH 01/14] gnu: Add go-github-com-anmitsu-go-shlex.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

Dominic Martinez schreef op do 10-03-2022 om 22:18 [-0500]:
> +(define-public go-github-com-anmitsu-go-shlex
> +  (package
> +    (name "go-github-com-anmitsu-go-shlex")
> +    (version "0.0.0-20200514113438-38f4b401e2be")
> +    (source
> +      (origin
> +        (method git-fetch)
> +        (uri (git-reference
> +               (url "https://github.com/anmitsu/go-shlex")
> +               (commit (go-version->git-ref version))))

What's the difference with go-github-com-flynn-archive-go-shlex?
Are they related?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH 01/14] gnu: Add go-github-com-anmitsu-go-shlex.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> What's the difference with go-github-com-flynn-archive-go-shlex?
> Are they related?

The author of go-github-com-flynn-archive-go-shlex marked it as 
unmaintained and it hasn't seen development since 
2015. go-github-com-anmitsu-go-shlex is currently maintained.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH v3 00/10] gnu: Add nebula.

[Dominic Martinez]

Here is a second version (v3 because of a previous small addendum) of
the patch to add Nebula. I've removed unecessary packages, revised the
descriptions, correctly set only the test dependencies to native
inputs, and removed windows-related blobs from the source.

The two package definitions that have changed significantly are
go-google-golang-org-protobuf and go-github-com-skip2-go-qrcode. I've
expanded further on their changes in their respective patches. Thank
you!

Dominic Martinez (10):
  gnu: Add go-github-com-anmitsu-go-shlex.
  gnu: Add go-github-com-armon-go-radix.
  gnu: Add go-github-com-cyberdelia-go-metrics-graphite.
  gnu: Add go-github-com-google-gopacket.
  gnu: Add go-github-com-miekg-dns.
  gnu: Add go-github-com-nbrownus-go-metrics-prometheus.
  gnu: Add go-github-com-songgao-water.
  gnu: Add go-google-golang-org-protobuf.
  gnu: Add go-github-com-skip2-go-qrcode.
  gnu: Add nebula.

 gnu/packages/golang.scm                       | 244 ++++++++++++++++++
 gnu/packages/networking.scm                   |  80 ++++++
 ...github-com-skip2-go-qrcode-fix-tests.patch |  37 +++
 3 files changed, 361 insertions(+)
 create mode 100644 gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch


base-commit: 9bd4ed3dded7b770f1989f6084d565f7086fdcd3
-- 
2.34.0

[bug#54335] [PATCH v3 01/10] gnu: Add go-github-com-anmitsu-go-shlex.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-anmitsu-go-shlex): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f3cc1bd6b8..3938137984 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -34,6 +34,7 @@
 ;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
 ;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
 ;;; Copyright © 2022 Pier-Hugues Pellerin <phpellerin@gmail.com>
+;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -9775,3 +9776,25 @@ (define-public go-github-com-go-chi-chi-v5
      "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user
 decompose request handling into many smaller layers.")
     (license license:expat)))
+
+(define-public go-github-com-anmitsu-go-shlex
+  (package
+    (name "go-github-com-anmitsu-go-shlex")
+    (version "0.0.0-20200514113438-38f4b401e2be")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/anmitsu/go-shlex")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "17iz68yzbnr7y4s493asbagbv79qq8hvl2pkxvm6bvdkgphj8w1g"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/anmitsu/go-shlex"))
+    (home-page "https://github.com/anmitsu/go-shlex")
+    (synopsis "Simple shell-like lexical analyzer for Go")
+    (description
+      "@code{go-github-com-anmitsu-go-shlex} provides a simple lexical
+analyzer to parse shell-like commands.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH v3 02/10] gnu: Add go-github-com-armon-go-radix.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-armon-go-radix): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3938137984..ba917911da 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9798,3 +9798,26 @@ (define-public go-github-com-anmitsu-go-shlex
       "@code{go-github-com-anmitsu-go-shlex} provides a simple lexical
 analyzer to parse shell-like commands.")
     (license license:expat)))
+
+(define-public go-github-com-armon-go-radix
+  (package
+    (name "go-github-com-armon-go-radix")
+    (version "1.0.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/armon/go-radix")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1m1k0jz9gjfrk4m7hjm7p03qmviamfgxwm2ghakqxw3hdds8v503"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/armon/go-radix"))
+    (home-page "https://github.com/armon/go-radix")
+    (synopsis "Go implementation of Radix trees")
+    (description
+      "@code{go-github-com-armon-go-radix} implements a
+@url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.  The package only
+provides a single @code{Tree} implementation, optimized for sparse nodes.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH v3 03/10] gnu: Add go-github-com-cyberdelia-go-metrics-graphite.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-cyberdelia-go-metrics-graphite): New variable.
---

The only test for this package tries to run and access a local server. As far
as I'm aware, trying to access a network interface is a no-go for Guix
packages (and also fails if I try to do it), but please correct me if I'm
wrong on this.

 gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ba917911da..a6ada9b1d6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9821,3 +9821,30 @@ (define-public go-github-com-armon-go-radix
 @url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.  The package only
 provides a single @code{Tree} implementation, optimized for sparse nodes.")
     (license license:expat)))
+
+(define-public go-github-com-cyberdelia-go-metrics-graphite
+  (package
+    (name "go-github-com-cyberdelia-go-metrics-graphite")
+    (version "0.0.0-20161219230853-39f87cc3b432")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/cyberdelia/go-metrics-graphite")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1nnpwryw8i110laffyavvhx38gcd1jnpdir69y6fxxzpx06d094w"))))
+    (build-system go-build-system)
+    (propagated-inputs
+     (list go-github-com-rcrowley-go-metrics))
+    (arguments
+     '(#:tests? #f ; Tests require network interface access
+       #:import-path "github.com/cyberdelia/go-metrics-graphite"))
+    (home-page "https://github.com/cyberdelia/go-metrics-graphite")
+    (synopsis "Graphite client for go-metrics")
+    (description
+      "@code{go-github-com-cyberdelia-go-metrics-graphite} is a reporter for
+the @url{https://github.com/rcrowley/go-metrics,go-metrics} library which
+posts metrics to Graphite.")
+    (license license:bsd-2)))
-- 
2.34.0

[bug#54335] [PATCH v3 04/10] gnu: Add go-github-com-google-gopacket.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-google-gopacket): New variable
---
 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a6ada9b1d6..ccda557600 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9848,3 +9848,27 @@ (define-public go-github-com-cyberdelia-go-metrics-graphite
 the @url{https://github.com/rcrowley/go-metrics,go-metrics} library which
 posts metrics to Graphite.")
     (license license:bsd-2)))
+
+(define-public go-github-com-google-gopacket
+  (package
+    (name "go-github-com-google-gopacket")
+    (version "1.1.19")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/google/gopacket")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "048qwm2n0wrpql4qqgd7jyynn3gk069yvqbxnshlayzmbhf87ls4"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/google/gopacket"))
+    (propagated-inputs
+      (list go-golang-org-x-sys go-golang-org-x-net))
+    (home-page "https://github.com/google/gopacket")
+    (synopsis "Provides packet processing capabilities for Go")
+    (description
+      "@code{go-github-com-google-gopacket} provides packet decoding for the
+Go language.")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH v3 05/10] gnu: Add go-github-com-miekg-dns.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-miekg-dns): New variable.
---
 gnu/packages/golang.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ccda557600..d6dca579de 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9872,3 +9872,33 @@ (define-public go-github-com-google-gopacket
       "@code{go-github-com-google-gopacket} provides packet decoding for the
 Go language.")
     (license license:bsd-3)))
+
+(define-public go-github-com-miekg-dns
+  (package
+    (name "go-github-com-miekg-dns")
+    (version "1.1.48")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/miekg/dns")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "14m4wnbgmc1prj4ds1fsz1nwb1awaq365lhbp8clzsidxmhjf3hl"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/miekg/dns"))
+    (propagated-inputs
+     (list go-golang-org-x-tools
+           go-golang-org-x-sys
+           go-golang-org-x-sync
+           go-golang-org-x-net))
+    (home-page "https://github.com/miekg/dns")
+    (synopsis "Domain Name Service library in Go")
+    (description
+      "@code{go-github-com-miekg-dns} implements a fully featured interface to
+the Domain Name System.  Both server and client side programming is supported.
+The package allows complete control over what is sent out to the @acronym{DNS,
+Domain Name Service}.  The API follows the less-is-more principle, by
+presenting a small interface.")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH v3 06/10] gnu: Add go-github-com-nbrownus-go-metrics-prometheus.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-nbrownus-go-metrics-prometheus): New
variable.
---
 gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d6dca579de..e588bbc960 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9902,3 +9902,31 @@ (define-public go-github-com-miekg-dns
 Domain Name Service}.  The API follows the less-is-more principle, by
 presenting a small interface.")
     (license license:bsd-3)))
+
+(define-public go-github-com-nbrownus-go-metrics-prometheus
+  (package
+    (name "go-github-com-nbrownus-go-metrics-prometheus")
+    (version "0.0.0-20210712211119-974a6260965f")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/nbrownus/go-metrics-prometheus")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1kl9l08aas544627zmhkgp843qx94sxs4inxm20nw1hx7gp79dz0"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/nbrownus/go-metrics-prometheus"))
+    (propagated-inputs
+     (list go-github-com-stretchr-testify
+           go-github-com-rcrowley-go-metrics
+           go-github-com-prometheus-client-golang))
+    (home-page "https://github.com/nbrownus/go-metrics-prometheus")
+    (synopsis "Prometheus support for go-metrics")
+    (description
+      "@code{go-github-com-nbrownus-go-metrics-prometheus} is a reporter for
+the go-metrics library which will post the metrics to the prometheus client
+registry.  It just updates the registry, taking care of exporting the metrics
+is still your responsibility.")
+    (license license:asl2.0)))
-- 
2.34.0

[bug#54335] [PATCH v3 07/10] gnu: Add go-github-com-songgao-water.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-songgao-water): New variable.
---

All the tests here require the ability to interact with TUN/TAP
interfaces. Again, as far as I'm aware that isn't allowed, so tests are
disabled.

 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e588bbc960..23543a0c2b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9930,3 +9930,27 @@ (define-public go-github-com-nbrownus-go-metrics-prometheus
 registry.  It just updates the registry, taking care of exporting the metrics
 is still your responsibility.")
     (license license:asl2.0)))
+
+(define-public go-github-com-songgao-water
+  (package
+    (name "go-github-com-songgao-water")
+    (version "0.0.0-20200317203138-2b4b6d7c09d8")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/songgao/water")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1k5aildfszp6x66jzar4y36lic8ijkb5020hfaivpvq3bnwdiikl"))))
+    (build-system go-build-system)
+    (arguments '(#:tests? #f ; Tests require network interface access
+                 #:import-path "github.com/songgao/water"))
+    (home-page "https://github.com/songgao/water")
+    (synopsis "Simple network tunnel/tap library")
+    (description
+      "@code{go-github-com-songgao-water} is a simple TUN/TAP interface
+library for Go that efficiently works with standard packages like io, bufio,
+etc..  Use waterutil with it to work with TUN/TAP packets/frames.")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH v3 08/10] gnu: Add go-google-golang-org-protobuf.

[Dominic Martinez]

* gnu/packages/golang.scm (go-google-golang-org-protobuf): New variable.
---

I took this go-google-golang-org-protobuf definition from #54560. I had
disabled builds/tests before because this package has many subpackages and no
top-level files, which the go-build-system doesn't directly support, so this
modifications builds and tests all the subpackages.

 gnu/packages/golang.scm | 43 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 23543a0c2b..db1ea44d8c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9954,3 +9954,46 @@ (define-public go-github-com-songgao-water
 library for Go that efficiently works with standard packages like io, bufio,
 etc..  Use waterutil with it to work with TUN/TAP packets/frames.")
     (license license:bsd-3)))
+
+(define-public go-google-golang-org-protobuf
+  (package
+    (name "go-google-golang-org-protobuf")
+    (version "1.28.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://go.googlesource.com/protobuf")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1nzcc4qc00afi24nb7nlnwyzvvr6b8s8qdrn1sw085nygh2y2x8r"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "google.golang.org/protobuf"
+       #:phases
+       ;; Build and test all sub-packages
+       (let ((glob-path "google.golang.org/protobuf/..."))
+         (modify-phases %standard-phases
+           (replace 'build
+             (lambda args
+               (apply (assoc-ref %standard-phases
+                                 'build)
+                      `(,@args #:import-path
+                               ,glob-path))))
+           (replace 'check
+             (lambda args
+               (apply (assoc-ref %standard-phases
+                                 'check)
+                      `(,@args #:import-path
+                               ,glob-path))))))))
+    (native-inputs (list go-github-com-google-go-cmp-cmp))
+    (synopsis "Go support for Google's protocol buffers")
+    (description
+     "Go implementation for protocol buffers, which is a
+language-neutral, platform-neutral, extensible mechanism for serializing
+structured data.  The protocol buffer language is a language for
+specifying the schema for structured data.  This schema is compiled into
+language specific bindings.")
+    (home-page "https://go.googlesource.com/protobuf")
+    (license license:bsd-3)))
-- 
2.34.0

[bug#54335] [PATCH v3 09/10] gnu: Add go-github-com-skip2-go-qrcode.

[Dominic Martinez]

* gnu/packages/golang.scm (go-github-com-skip2-go-qrcode): New variable.
---

The go-qrcode decoding test doesn't compile due to a change in Go's int to
string conversion. There is an active pull request with the fix at
https://github.com/skip2/go-qrcode/pull/53, but in the meantime I included a
patch for the test.

 gnu/packages/golang.scm                       | 22 +++++++++++
 ...github-com-skip2-go-qrcode-fix-tests.patch | 37 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index db1ea44d8c..0eae371f40 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9997,3 +9997,25 @@ (define-public go-google-golang-org-protobuf
 language specific bindings.")
     (home-page "https://go.googlesource.com/protobuf")
     (license license:bsd-3)))
+
+(define-public go-github-com-skip2-go-qrcode
+  (package
+    (name "go-github-com-skip2-go-qrcode")
+    (version "0.0.0-20200617195104-da1b6568686e")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/skip2/go-qrcode")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0pghd6y2x8a5fqy4rjn4d8j5jcslb236naycdza5an7vyvinsgs9"))
+       (patches (search-patches "go-github-com-skip2-go-qrcode-fix-tests.patch"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/skip2/go-qrcode"))
+    (home-page "https://github.com/skip2/go-qrcode")
+    (synopsis "QR code encoder")
+    (description "@code{go-github-com-skip2-go-qrcode} provides a QR code
+encoder for the Go language.")
+    (license license:expat)))
diff --git a/gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch b/gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch
new file mode 100644
index 0000000000..631cb0cdab
--- /dev/null
+++ b/gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch
@@ -0,0 +1,37 @@
+From dd203f29a36bf518deacbc03e8562b0195c8345f Mon Sep 17 00:00:00 2001
+From: Dominic Martinez <dom@dominicm.dev>
+Date: Mon, 4 Apr 2022 12:06:03 -0400
+Subject: [PATCH] Fix failing qr decode test
+
+First convert integers into runes before performing a string conversion.
+---
+ qrcode_decode_test.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/qrcode_decode_test.go b/qrcode_decode_test.go
+index 1f4b1d3..2b0756b 100644
+--- a/qrcode_decode_test.go
++++ b/qrcode_decode_test.go
+@@ -122,7 +122,7 @@ func TestDecodeAllCharacters(t *testing.T) {
+ 
+ 	// zbarimg has trouble with null bytes, hence start from ASCII 1.
+ 	for i := 1; i < 256; i++ {
+-		content += string(i)
++		content += string(rune(i))
+ 	}
+ 
+ 	q, err := New(content, Low)
+@@ -154,7 +154,7 @@ func TestDecodeFuzz(t *testing.T) {
+ 		for j := 0; j < len; j++ {
+ 			// zbarimg seems to have trouble with special characters, test printable
+ 			// characters only for now.
+-			content += string(32 + r.Intn(94))
++			content += string(rune(32 + r.Intn(94)))
+ 		}
+ 
+ 		for _, level := range []RecoveryLevel{Low, Medium, High, Highest} {
+
+base-commit: da1b6568686e89143e94f980a98bc2dbd5537f13
+-- 
+2.34.0
+
-- 
2.34.0

[bug#54335] [PATCH v3 10/10] gnu: Add nebula.

[Dominic Martinez]

* gnu/packages/networking.scm (nebula): New variable.
---

I tried to modify the description to more accurately describe the difference
between Nebula and other, distributed overlay networks currently on Guix like
yggdrasil and gnunet, but I'm not sure I did a good job.

I also wasn't sure whether to remove the blobs in a phase or source snippet,
since existing packages seem to do both. I opted for the snippet so that the
blobs would never touch the source definition.

 gnu/packages/networking.scm | 80 +++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b45f2f79f2..51285df685 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -48,6 +48,7 @@
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Simon South <simon@simonsouth.net>
+;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -140,6 +141,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages syncthing)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages textutils)
@@ -4191,3 +4193,81 @@ (define-public putty
 implementations.")
     (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/")
     (license license:expat)))
+
+(define-public nebula
+  (package
+    (name "nebula")
+    (version "1.5.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/slackhq/nebula")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "14b7wgx83w1fhcbhsn0mfg872hkml4wwbzimb3bjvc3xpzx6w44k"))
+              ;; Remove windows-related binary blobs and files
+              (snippet
+               #~(begin
+                   (use-modules (guix build utils))
+                   (delete-file-recursively "dist/windows")
+                   (delete-file-recursively "wintun")))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/slackhq/nebula"
+       #:install-source? #f
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'build
+           (lambda _
+             ;; Build nebula and nebula-cert
+             (let* ((dir "github.com/slackhq/nebula")
+                    (nebula-cmd (string-append dir "/cmd/nebula"))
+                    (cert-cmd (string-append dir "/cmd/nebula-cert")))
+               (invoke "go" "build" nebula-cmd)
+               (invoke "go" "build" cert-cmd))))
+
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bindir (string-append out "/bin")))
+               (install-file "nebula" bindir)
+               (install-file "nebula-cert" bindir)))))))
+    (inputs
+     (list go-golang-org-x-term
+           go-gopkg-in-yaml-v2
+           go-google-golang-org-protobuf
+           go-golang-org-x-sys
+           go-golang-org-x-net
+           go-golang-org-x-crypto
+           go-netns
+           go-netlink
+           go-github-com-skip2-go-qrcode
+           go-github-com-stretchr-testify
+           go-github-com-songgao-water
+           go-github-com-sirupsen-logrus
+           go-github-com-rcrowley-go-metrics
+           go-github-com-prometheus-procfs
+           go-github-com-prometheus-client-model
+           go-github-com-prometheus-client-golang
+           go-github-com-nbrownus-go-metrics-prometheus
+           go-github-com-miekg-dns
+           go-github-com-imdario-mergo
+           go-github-com-google-gopacket
+           go-github-com-gogo-protobuf
+           go-github-com-flynn-noise
+           go-github-com-cyberdelia-go-metrics-graphite
+           go-github-com-cespare-xxhash
+           go-github-com-armon-go-radix
+           go-github-com-anmitsu-go-shlex))
+    (home-page "https://github.com/slackhq/nebula")
+    (synopsis "Scalable, peer-to-peer overlay networking tool")
+    (description
+     "Nebula is a peer-to-peer networking tool based on the
+@url{https://noiseprotocol.org/, Noise Protocol Framework}.  It is not a fully
+decentralized network, but instead uses central discovery nodes and a
+certificate authority to facilitate direct, encrypted peer-to-peer connections
+from behind most firewalls and @acronym{NAT, Network Address Translation}
+layers.")
+    (license license:expat)))
-- 
2.34.0

[bug#54335] [PATCH v3 10/10] gnu: Add nebula.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

Dominic Martinez schreef op ma 04-04-2022 om 15:32 [-0400]:
> +     "Nebula is a peer-to-peer networking tool based on the
> +@url{https://noiseprotocol.org/, Noise Protocol Framework}.  It is not a fully
> +decentralized network, but instead uses central discovery nodes and a
> +certificate authority to facilitate direct, encrypted peer-to-peer connections
> +from behind most firewalls and @acronym{NAT, Network Address Translation}
> +layers.")

Looks like a nice description, thanks.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54335] [PATCH v3 00/10] gnu: Add nebula.

[Dominic Martinez]

[-- Attachment #1: Type: text/plain, Size: 124 bytes --]


Gentle ping; I'm steadily working on a service for this and would 
love for the package to be available when that's done.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] Status check

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 124 bytes --]

Hi,

This patch series would allow to add some other nice packages.

Is anything blocking them to be merged?

Regards,
Oleg

[-- Attachment #2: Type: text/html, Size: 306 bytes --]

[bug#54335] [PATCH 00/14] gnu: Add nebula.

[zimoun]

Hi Oleg,

On Wed, 05 Oct 2022 at 19:30, Sharlatan Hellseher <sharlatanus@gmail.com> wrote:

> This patch series would allow to add some other nice packages.

Do the patches still apply?


> Is anything blocking them to be merged?

Well, interestingly the team Go has no member.

--8<---------------cut here---------------start------------->8---
id: go
name: Go team
description: <none>
scope: "gnu/packages/golang.scm" "guix/build/go-build-system.scm" "guix/build-system/go.scm" "guix/import/go.scm" "guix/scripts/import/go.scm" "tests/go.scm"
members:
--8<---------------cut here---------------end--------------->8---

Therefore, let CC teams core and mentors. :-)

Cheers,
simon

[bug#54335] Status check

[Dominic Martinez via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

There's an incompatibility with the version of protobuf used that 
breaks the package at runtime, and requires moving to the new 
protobuf. The patch is also generally out of date, so I need to 
work in updating/testing the packages.

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

> Hi,
>
> This patch series would allow to add some other nice packages.
>
> Is anything blocking them to be merged?
>
> Regards,
> Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#54335] [PATCH v4 00/12] gnu: Add nebula.

[Alexey Abramov via Guix-patches via]

Hi,

I took the libery to rebase amazing work of Dominic. Thanks Dominic! I also
bump nebula to the latest version.

One thing is not clear to me is Mergo package. In version 1.0.0 they moved to
a dario.cat/mergo. So I defined a new package for it, but kept fetching the
source from github.

Alexey Abramov (2):
  gnu: Add go-dario-cat-mergo.
  gnu: nebula: Update to 1.8.2.

Dominic Martinez (10):
  gnu: Add go-github-com-anmitsu-go-shlex.
  gnu: Add go-github-com-armon-go-radix.
  gnu: Add go-github-com-cyberdelia-go-metrics-graphite.
  gnu: Add go-github-com-google-gopacket.
  gnu: Add go-github-com-miekg-dns.
  gnu: Add go-github-com-nbrownus-go-metrics-prometheus.
  gnu: Add go-github-com-songgao-water.
  gnu: Add go-google-golang-org-protobuf.
  gnu: Add go-github-com-skip2-go-qrcode.
  gnu: Add nebula.

 gnu/packages/golang.scm                       | 271 ++++++++++++++++++
 gnu/packages/networking.scm                   |  85 ++++++
 ...github-com-skip2-go-qrcode-fix-tests.patch |  37 +++
 3 files changed, 393 insertions(+)
 create mode 100644 gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch

-- 
2.41.0

[bug#54335] [PATCH v4 01/12] gnu: Add go-github-com-anmitsu-go-shlex.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-anmitsu-go-shlex): New variable.
---
 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 163691a1e6..8e6c629dc8 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11662,6 +11663,29 @@ (define-public go-github-com-onsi-gomega
      "Gomega is the preferred matcher library for the Ginkgo test framework.")
     (license license:expat)))
 
+
+(define-public go-github-com-anmitsu-go-shlex
+  (package
+    (name "go-github-com-anmitsu-go-shlex")
+    (version "0.0.0-20200514113438-38f4b401e2be")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/anmitsu/go-shlex")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "17iz68yzbnr7y4s493asbagbv79qq8hvl2pkxvm6bvdkgphj8w1g"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/anmitsu/go-shlex"))
+    (home-page "https://github.com/anmitsu/go-shlex")
+    (synopsis "Simple shell-like lexical analyzer for Go")
+    (description
+      "@code{go-github-com-anmitsu-go-shlex} provides a simple lexical
+analyzer to parse shell-like commands.")
+    (license license:expat)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 02/12] gnu: Add go-github-com-armon-go-radix.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-armon-go-radix): New variable.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8e6c629dc8..6ca2d23f83 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11686,6 +11686,29 @@ (define-public go-github-com-anmitsu-go-shlex
 analyzer to parse shell-like commands.")
     (license license:expat)))
 
+(define-public go-github-com-armon-go-radix
+  (package
+    (name "go-github-com-armon-go-radix")
+    (version "1.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/armon/go-radix")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1m1k0jz9gjfrk4m7hjm7p03qmviamfgxwm2ghakqxw3hdds8v503"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/armon/go-radix"))
+    (home-page "https://github.com/armon/go-radix")
+    (synopsis "Go implementation of Radix trees")
+    (description
+     "@code{go-github-com-armon-go-radix} implements a
+@url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}. The package only
+provides a single @code{Tree} implementation, optimized for sparse nodes.")
+    (license license:expat)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 03/12] gnu: Add go-github-com-cyberdelia-go-metrics-graphite.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-cyberdelia-go-metrics-graphite): New variable.
---
 gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6ca2d23f83..82bfcc1a46 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11709,6 +11709,34 @@ (define-public go-github-com-armon-go-radix
 provides a single @code{Tree} implementation, optimized for sparse nodes.")
     (license license:expat)))
 
+
+(define-public go-github-com-cyberdelia-go-metrics-graphite
+  (package
+    (name "go-github-com-cyberdelia-go-metrics-graphite")
+    (version "0.0.0-20161219230853-39f87cc3b432")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/cyberdelia/go-metrics-graphite")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1nnpwryw8i110laffyavvhx38gcd1jnpdir69y6fxxzpx06d094w"))))
+    (build-system go-build-system)
+    (propagated-inputs
+     (list go-github-com-rcrowley-go-metrics))
+    (arguments
+     '(#:tests? #f ; Tests require network interface access
+       #:import-path "github.com/cyberdelia/go-metrics-graphite"))
+    (home-page "https://github.com/cyberdelia/go-metrics-graphite")
+    (synopsis "Graphite client for go-metrics")
+    (description
+      "@code{go-github-com-cyberdelia-go-metrics-graphite} is a reporter for
+the @url{https://github.com/rcrowley/go-metrics,go-metrics} library which
+posts metrics to Graphite.")
+    (license license:bsd-2)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 04/12] gnu: Add go-github-com-google-gopacket.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-google-gopacket): New variable
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 82bfcc1a46..18812fb4c7 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11737,6 +11737,31 @@ (define-public go-github-com-cyberdelia-go-metrics-graphite
 posts metrics to Graphite.")
     (license license:bsd-2)))
 
+
+(define-public go-github-com-google-gopacket
+  (package
+    (name "go-github-com-google-gopacket")
+    (version "1.1.19")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/google/gopacket")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "048qwm2n0wrpql4qqgd7jyynn3gk069yvqbxnshlayzmbhf87ls4"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/google/gopacket"))
+    (propagated-inputs
+      (list go-golang-org-x-sys go-golang-org-x-net))
+    (home-page "https://github.com/google/gopacket")
+    (synopsis "Provides packet processing capabilities for Go")
+    (description
+      "@code{go-github-com-google-gopacket} provides packet decoding for the
+Go language.")
+    (license license:bsd-3)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 05/12] gnu: Add go-github-com-miekg-dns.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-miekg-dns): New variable.
---
 gnu/packages/golang.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 18812fb4c7..96ddb73d6a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11762,6 +11762,37 @@ (define-public go-github-com-google-gopacket
 Go language.")
     (license license:bsd-3)))
 
+
+(define-public go-github-com-miekg-dns
+  (package
+    (name "go-github-com-miekg-dns")
+    (version "1.1.48")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/miekg/dns")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "14m4wnbgmc1prj4ds1fsz1nwb1awaq365lhbp8clzsidxmhjf3hl"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/miekg/dns"))
+    (propagated-inputs
+     (list go-golang-org-x-tools
+           go-golang-org-x-sys
+           go-golang-org-x-sync
+           go-golang-org-x-net))
+    (home-page "https://github.com/miekg/dns")
+    (synopsis "Domain Name Service library in Go")
+    (description
+      "@code{go-github-com-miekg-dns} implements a fully featured interface to
+the Domain Name System.  Both server and client side programming is supported.
+The package allows complete control over what is sent out to the @acronym{DNS,
+Domain Name Service}.  The API follows the less-is-more principle, by
+presenting a small interface.")
+    (license license:bsd-3)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 06/12] gnu: Add go-github-com-nbrownus-go-metrics-prometheus.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-nbrownus-go-metrics-prometheus): New
variable.
---
 gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 96ddb73d6a..56965e3394 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11793,6 +11793,34 @@ (define-public go-github-com-miekg-dns
 presenting a small interface.")
     (license license:bsd-3)))
 
+(define-public go-github-com-nbrownus-go-metrics-prometheus
+  (package
+    (name "go-github-com-nbrownus-go-metrics-prometheus")
+    (version "0.0.0-20210712211119-974a6260965f")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/nbrownus/go-metrics-prometheus")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1kl9l08aas544627zmhkgp843qx94sxs4inxm20nw1hx7gp79dz0"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/nbrownus/go-metrics-prometheus"))
+    (propagated-inputs
+     (list go-github-com-stretchr-testify
+           go-github-com-rcrowley-go-metrics
+           go-github-com-prometheus-client-golang))
+    (home-page "https://github.com/nbrownus/go-metrics-prometheus")
+    (synopsis "Prometheus support for go-metrics")
+    (description
+      "@code{go-github-com-nbrownus-go-metrics-prometheus} is a reporter for
+the go-metrics library which will post the metrics to the prometheus client
+registry.  It just updates the registry, taking care of exporting the metrics
+is still your responsibility.")
+    (license license:asl2.0)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 07/12] gnu: Add go-github-com-songgao-water.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-songgao-water): New variable.
---
 gnu/packages/golang.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 56965e3394..b87e820db1 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11821,6 +11821,30 @@ (define-public go-github-com-nbrownus-go-metrics-prometheus
 is still your responsibility.")
     (license license:asl2.0)))
 
+(define-public go-github-com-songgao-water
+  (package
+    (name "go-github-com-songgao-water")
+    (version "0.0.0-20200317203138-2b4b6d7c09d8")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/songgao/water")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1k5aildfszp6x66jzar4y36lic8ijkb5020hfaivpvq3bnwdiikl"))))
+    (build-system go-build-system)
+    (arguments '(#:tests? #f ; Tests require network interface access
+                 #:import-path "github.com/songgao/water"))
+    (home-page "https://github.com/songgao/water")
+    (synopsis "Simple network tunnel/tap library")
+    (description
+      "@code{go-github-com-songgao-water} is a simple TUN/TAP interface
+library for Go that efficiently works with standard packages like io, bufio,
+etc..  Use waterutil with it to work with TUN/TAP packets/frames.")
+    (license license:bsd-3)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 08/12] gnu: Add go-google-golang-org-protobuf.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-google-golang-org-protobuf): New variable.
---
 gnu/packages/golang.scm | 42 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b87e820db1..2f419fe35d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11845,6 +11845,48 @@ (define-public go-github-com-songgao-water
 etc..  Use waterutil with it to work with TUN/TAP packets/frames.")
     (license license:bsd-3)))
 
+(define-public go-google-golang-org-protobuf
+  (package
+    (name "go-google-golang-org-protobuf")
+    (version "1.28.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://go.googlesource.com/protobuf")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1nzcc4qc00afi24nb7nlnwyzvvr6b8s8qdrn1sw085nygh2y2x8r"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "google.golang.org/protobuf"
+       #:phases
+       ;; Build and test all sub-packages
+       (let ((glob-path "google.golang.org/protobuf/..."))
+         (modify-phases %standard-phases
+           (replace 'build
+             (lambda args
+               (apply (assoc-ref %standard-phases
+                                 'build)
+                      `(,@args #:import-path
+                               ,glob-path))))
+           (replace 'check
+             (lambda args
+               (apply (assoc-ref %standard-phases
+                                 'check)
+                      `(,@args #:import-path
+                               ,glob-path))))))))
+    (native-inputs (list go-github-com-google-go-cmp-cmp))
+    (synopsis "Go support for Google's protocol buffers")
+    (description
+     "Go implementation for protocol buffers, which is a
+language-neutral, platform-neutral, extensible mechanism for serializing
+structured data.  The protocol buffer language is a language for
+specifying the schema for structured data.  This schema is compiled into
+language specific bindings.")
+    (home-page "https://go.googlesource.com/protobuf")
+    (license license:bsd-3)))
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.41.0

[bug#54335] [PATCH v4 09/12] gnu: Add go-github-com-skip2-go-qrcode.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/golang.scm (go-github-com-skip2-go-qrcode): New variable.
---
 gnu/packages/golang.scm                       | 23 ++++++++++++
 ...github-com-skip2-go-qrcode-fix-tests.patch | 37 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2f419fe35d..4196ffe2c9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11887,6 +11887,29 @@ (define-public go-google-golang-org-protobuf
 language specific bindings.")
     (home-page "https://go.googlesource.com/protobuf")
     (license license:bsd-3)))
+
+(define-public go-github-com-skip2-go-qrcode
+  (package
+    (name "go-github-com-skip2-go-qrcode")
+    (version "0.0.0-20200617195104-da1b6568686e")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/skip2/go-qrcode")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0pghd6y2x8a5fqy4rjn4d8j5jcslb236naycdza5an7vyvinsgs9"))
+       (patches (search-patches "go-github-com-skip2-go-qrcode-fix-tests.patch"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "github.com/skip2/go-qrcode"))
+    (home-page "https://github.com/skip2/go-qrcode")
+    (synopsis "QR code encoder")
+    (description "@code{go-github-com-skip2-go-qrcode} provides a QR code
+encoder for the Go language.")
+    (license license:expat)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch b/gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch
new file mode 100644
index 0000000000..631cb0cdab
--- /dev/null
+++ b/gnu/packages/patches/go-github-com-skip2-go-qrcode-fix-tests.patch
@@ -0,0 +1,37 @@
+From dd203f29a36bf518deacbc03e8562b0195c8345f Mon Sep 17 00:00:00 2001
+From: Dominic Martinez <dom@dominicm.dev>
+Date: Mon, 4 Apr 2022 12:06:03 -0400
+Subject: [PATCH] Fix failing qr decode test
+
+First convert integers into runes before performing a string conversion.
+---
+ qrcode_decode_test.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/qrcode_decode_test.go b/qrcode_decode_test.go
+index 1f4b1d3..2b0756b 100644
+--- a/qrcode_decode_test.go
++++ b/qrcode_decode_test.go
+@@ -122,7 +122,7 @@ func TestDecodeAllCharacters(t *testing.T) {
+ 
+ 	// zbarimg has trouble with null bytes, hence start from ASCII 1.
+ 	for i := 1; i < 256; i++ {
+-		content += string(i)
++		content += string(rune(i))
+ 	}
+ 
+ 	q, err := New(content, Low)
+@@ -154,7 +154,7 @@ func TestDecodeFuzz(t *testing.T) {
+ 		for j := 0; j < len; j++ {
+ 			// zbarimg seems to have trouble with special characters, test printable
+ 			// characters only for now.
+-			content += string(32 + r.Intn(94))
++			content += string(rune(32 + r.Intn(94)))
+ 		}
+ 
+ 		for _, level := range []RecoveryLevel{Low, Medium, High, Highest} {
+
+base-commit: da1b6568686e89143e94f980a98bc2dbd5537f13
+-- 
+2.34.0
+
-- 
2.41.0

[bug#54335] [PATCH v4 10/12] gnu: Add nebula.

[Alexey Abramov via Guix-patches via]

From: Dominic Martinez <dom@dominicm.dev>

* gnu/packages/networking.scm (nebula): New variable.

Co-authored-by: Alexey Abramov <levenson@mmer.org>
---
 gnu/packages/networking.scm | 84 +++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index ca826bf864..0addb3cedd 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -62,6 +62,8 @@
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
+;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
+;;; Copyright © 2024 Alexey Abramov <levenson@mmer.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -125,6 +127,8 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
@@ -164,6 +168,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages syncthing)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages telephony)
@@ -4837,6 +4842,7 @@ (define-public putty
     (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/")
     (license license:expat)))
 
+
 (define-public vnstat
   (package
    (name "vnstat")
@@ -4935,3 +4941,81 @@ (define-public dropwatch
 recording packets that are dropped by the kernel.  It provides the commands
 @command{dropwatch} and @command{dwdump}.")
     (license license:gpl2+)))
+
+(define-public nebula
+  (package
+    (name "nebula")
+    (version "1.5.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/slackhq/nebula")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "14b7wgx83w1fhcbhsn0mfg872hkml4wwbzimb3bjvc3xpzx6w44k"))
+              ;; Remove windows-related binary blobs and files
+              (snippet
+               #~(begin
+                   (use-modules (guix build utils))
+                   (delete-file-recursively "dist/windows")
+                   (delete-file-recursively "wintun")))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/slackhq/nebula"
+       #:install-source? #f
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'build
+           (lambda _
+             ;; Build nebula and nebula-cert
+             (let* ((dir "github.com/slackhq/nebula")
+                    (nebula-cmd (string-append dir "/cmd/nebula"))
+                    (cert-cmd (string-append dir "/cmd/nebula-cert")))
+               (invoke "go" "build" nebula-cmd)
+               (invoke "go" "build" cert-cmd))))
+
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bindir (string-append out "/bin")))
+               (install-file "nebula" bindir)
+               (install-file "nebula-cert" bindir)))))))
+    (inputs
+     (list go-golang-org-x-term
+           go-gopkg-in-yaml-v2
+           go-google-golang-org-protobuf
+           go-golang-org-x-sys
+           go-golang-org-x-net
+           go-golang-org-x-crypto
+           go-netns
+           go-netlink
+           go-github-com-skip2-go-qrcode
+           go-github-com-stretchr-testify
+           go-github-com-songgao-water
+           go-github-com-sirupsen-logrus
+           go-github-com-rcrowley-go-metrics
+           go-github-com-prometheus-procfs
+           go-github-com-prometheus-client-model
+           go-github-com-prometheus-client-golang
+           go-github-com-nbrownus-go-metrics-prometheus
+           go-github-com-miekg-dns
+           go-github-com-imdario-mergo
+           go-github-com-google-gopacket
+           go-github-com-gogo-protobuf
+           go-github-com-flynn-noise
+           go-github-com-cyberdelia-go-metrics-graphite
+           go-github-com-cespare-xxhash
+           go-github-com-armon-go-radix
+           go-github-com-anmitsu-go-shlex))
+    (home-page "https://github.com/slackhq/nebula")
+    (synopsis "Scalable, peer-to-peer overlay networking tool")
+    (description
+     "Nebula is a peer-to-peer networking tool based on the
+@url{https://noiseprotocol.org/, Noise Protocol Framework}.  It is not a fully
+decentralized network, but instead uses central discovery nodes and a
+certificate authority to facilitate direct, encrypted peer-to-peer connections
+from behind most firewalls and @acronym{NAT, Network Address Translation}
+layers.")
+    (license license:expat)))
-- 
2.41.0

[bug#54335] [PATCH v4 11/12] gnu: Add go-dario-cat-mergo.

[Alexey Abramov via Guix-patches via]

* gnu/packages/golang.scm: This is a new version of
go-github-com-imdario-mergo. It was renamed and now used as
dario.cat/mergo in tests and other places.
---
 gnu/packages/golang.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4196ffe2c9..2382af0e1d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8080,6 +8080,29 @@ (define-public go-github-com-imdario-mergo
 maps (because they are not addressable using Go reflection).")
     (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-masterminds-sprig
   (package
     (name "go-github-com-masterminds-sprig")
-- 
2.41.0

[bug#54335] [PATCH v4 12/12] gnu: nebula: Update to 1.8.2.

[Alexey Abramov via Guix-patches via]

* gnu/packages/networking.scm (nebula): Change go version to
1.20. Use dario.cat/mergo v1.0.0 (previously imdario/mergo).
---
 gnu/packages/networking.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 0addb3cedd..856c1d4f20 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4945,7 +4945,7 @@ (define-public dropwatch
 (define-public nebula
   (package
     (name "nebula")
-    (version "1.5.2")
+    (version "1.8.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4954,7 +4954,7 @@ (define-public nebula
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "14b7wgx83w1fhcbhsn0mfg872hkml4wwbzimb3bjvc3xpzx6w44k"))
+                "0ly1axgmskrkmxhzymqis6gxf2wd7rvhycm94wfb8k0hirndvg5m"))
               ;; Remove windows-related binary blobs and files
               (snippet
                #~(begin
@@ -4963,7 +4963,8 @@ (define-public nebula
                    (delete-file-recursively "wintun")))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/slackhq/nebula"
+     `(#:go ,go-1.20
+       #:import-path "github.com/slackhq/nebula"
        #:install-source? #f
        #:phases
        (modify-phases %standard-phases
@@ -5001,7 +5002,7 @@ (define-public nebula
            go-github-com-prometheus-client-golang
            go-github-com-nbrownus-go-metrics-prometheus
            go-github-com-miekg-dns
-           go-github-com-imdario-mergo
+           go-dario-cat-mergo
            go-github-com-google-gopacket
            go-github-com-gogo-protobuf
            go-github-com-flynn-noise
-- 
2.41.0

bug#54335: [PATCH 00/14] gnu: Add nebula.

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]


Hi Dominic and  Alexey!

Thank you for the work and patience to bring Nebula to Guix.

I've shifted new packages into golang-xyz and move some from (gnu packages
syncthing) to prevent it's inclusion into (gnu packages networking).

Some of packages were already available so I've not include them.

- Modification applied [10/10]
  1. [X] go-github-com-anmitsu-go-shlex
     - Adjust description
     - Placed to (gnu packages golang-xyz)
  2. [X] go-github-com-armon-go-radix
     - Adjust description
     - Placed to (gnu packages golang-xyz)
  3. [X] go-github-com-cyberdelia-go-metrics-graphite
     - Adjust description
     - Placed to (gnu packages golang-xyz)
  4. [X] go-github-com-google-gopacket
     - Added in 124ca1e500d65b57c802ee06423c1581a197ee1f by Hilton Chain <hako@ultrarare.space>
  5. [X] go-github-com-miekg-dns
     - Adjust description
     - Placed to (gnu packages golang-xyz)
  6. [X] go-github-com-nbrownus-go-metrics-prometheus
     - Adjust description
     - Placed to (gnu packages golang-xyz)
  7. [X] go-github-com-songgao-water
     - Adjust description
     - Placed to (gnu packages golang-xyz)
  8. [X] go-google-golang-org-protobuf
     - Added in 8835937ea5d708f322aa7ceabcf0d827f38168fc by  (unmatched-parenthesis <paren@disroot.org>
  9. [X] go-github-com-skip2-go-qrcode
     - Adjust description
     - Placed to (gnu packages golang-xyz)
     - Mentioned in https://issues.guix.gnu.org/62284
  10. [X] go-dario-cat-mergo

Pushed as 0969cb0b48..ace1785c5d to master.

--
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]