From 0b0165cadee4d9ebf472506a0431b366c1633f7b Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Mon, 11 Nov 2024 10:38:55 +0100 Subject: [PATCH] backporting missing dependency for netbird native client (wip) --- glicid/packages/vpn.scm | 97 ++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 36 deletions(-) diff --git a/glicid/packages/vpn.scm b/glicid/packages/vpn.scm index d36a2b3..eef13da 100644 --- a/glicid/packages/vpn.scm +++ b/glicid/packages/vpn.scm @@ -35,11 +35,11 @@ `(#:install-plan `(("netbird" "/bin/")))) (propagated-inputs (list openresolv iptables nftables ebtables le-certs nss-certs)) (synopsis "NetBird combines a configuration-free peer-to-peer private network and a centralized access control system in a single platform, making it easy to create secure private networks for your organization or home. -Connect. NetBird creates a WireGuard-based overlay network that automatically connects your machines over an encrypted tunnel, leaving behind the hassle of opening ports, complex firewall rules, VPN gateways, and so forth. -Secure. NetBird enables secure remote access by applying granular access policies while allowing you to manage them intuitively from a single place. Works universally on any infrastructure.") - (description "netbird client cli program. dirty version from github artifacts.") - (home-page "https://github.com/netbirdio/netbird") - (license license:expat))) + Connect. NetBird creates a WireGuard-based overlay network that automatically connects your machines over an encrypted tunnel, leaving behind the hassle of opening ports, complex firewall rules, VPN gateways, and so forth. + Secure. NetBird enables secure remote access by applying granular access policies while allowing you to manage them intuitively from a single place. Works universally on any infrastructure.") + (description "netbird client cli program. dirty version from github artifacts.") + (home-page "https://github.com/netbirdio/netbird") + (license license:expat))) (define-public go-netbird-cli (package @@ -54,38 +54,38 @@ Secure. NetBird enables secure remote access by applying granular access policie (sha256 (base32 "0hgshjvy6499nfb98pga71c16f6gpnhc1m7h07nrvqlsb4hj4ykv")))) (build-system go-build-system) (native-inputs (list go-github-com-cenkalti-backoff-v4 - go-github-com-ayufan-golang-kardianos-service - go-github-com-google-uuid - go-github-com-pion-ice-v3 - go-github-com-pion-logging - go-github-com-pion-stun-v2 - go-github-com-pion-transport-v3 - go-github-com-sirupsen-logrus - go-golang-zx2c4-com-wireguard - go-github-com-google-gopacket - go-github-com-libp2p-go-netroute - go-github-com-mdlayher-socket - go-github-com-hashicorp-go-multierror - go-github-com-godbus-dbus-v5 - go-github-com-vishvananda-netlink - go-gopkg-in-natefinch-lumberjack.v2 - go-google-golang-org-protobuf - go-github-com-spf13-pflag - go-github-com-spf13-cobra - go-github-com-skratchdot-open-golang - go-golang-org-x-oauth2 - go-github-com-miekg-dns - go-github-com-hashicorp-go-version - go-github-com-fsnotify-fsnotify - )) + go-github-com-ayufan-golang-kardianos-service + go-github-com-google-uuid + go-github-com-pion-ice-v3 + go-github-com-pion-logging + go-github-com-pion-stun-v2 + go-github-com-pion-transport-v3 + go-github-com-sirupsen-logrus + go-golang-zx2c4-com-wireguard + go-github-com-google-gopacket + go-github-com-libp2p-go-netroute + go-github-com-mdlayher-socket + go-github-com-hashicorp-go-multierror + go-github-com-godbus-dbus-v5 + go-github-com-vishvananda-netlink + go-gopkg-in-natefinch-lumberjack.v2 + go-google-golang-org-protobuf + go-github-com-spf13-pflag + go-github-com-spf13-cobra + go-github-com-skratchdot-open-golang + go-golang-org-x-oauth2 + go-github-com-miekg-dns + go-github-com-hashicorp-go-version + go-github-com-fsnotify-fsnotify + )) (arguments `(#:import-path "github.com/netbirdio/netbird" #:phases (modify-phases %standard-phases (replace 'build - (lambda _ - (invoke "go" "build" "-C" "src/github.com/netbirdio/netbird/client") - ))))) + (lambda _ + (invoke "go" "build" "-C" "src/github.com/netbirdio/netbird/client") + ))))) (synopsis "") (description "") (home-page "") @@ -107,8 +107,33 @@ Secure. NetBird enables secure remote access by applying granular access policie #:patchelf-plan `(("netbird-ui" ("libx11" "libglvnd"))) #:strip-binaries? #f)) (synopsis "NetBird combines a configuration-free peer-to-peer private network and a centralized access control system in a single platform, making it easy to create secure private networks for your organization or home. -Connect. NetBird creates a WireGuard-based overlay network that automatically connects your machines over an encrypted tunnel, leaving behind the hassle of opening ports, complex firewall rules, VPN gateways, and so forth. -Secure. NetBird enables secure remote access by applying granular access policies while allowing you to manage them intuitively from a single place. Works universally on any infrastructure.") - (description "netbird client ui program. dirty version from github artifacts.") - (home-page "https://github.com/netbirdio/netbird") + Connect. NetBird creates a WireGuard-based overlay network that automatically connects your machines over an encrypted tunnel, leaving behind the hassle of opening ports, complex firewall rules, VPN gateways, and so forth. + Secure. NetBird enables secure remote access by applying granular access policies while allowing you to manage them intuitively from a single place. Works universally on any infrastructure.") + (description "netbird client ui program. dirty version from github artifacts.") + (home-page "https://github.com/netbirdio/netbird") + (license license:expat))) + + +(define-public go-gopkg-in-natefinch-lumberjack.v2 + (package + (name "go-gopkg-in-natefinch-lumberjack.v2") + (version "2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/natefinch/lumberjack") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d")))) + (build-system go-build-system) + (arguments + (list + #:import-path "gopkg.in/natefinch/lumberjack.v2")) + (propagated-inputs + (list go-github-com-burntsushi-toml + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/natefinch/lumberjack") + (synopsis "Rolling logger for Go") + (description "Lumberjack is a Go package for writing logs to rolling files.") (license license:expat)))