From 9ff81afd7ea75c583adaef3a49e9b28b45185d99 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 19 Apr 2022 18:09:56 +0200 Subject: Wesher package now works --- nix/configuration.nix | 8 ++++---- nix/wesher.nix | 36 +++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/nix/configuration.nix b/nix/configuration.nix index bc4edd5..2255d7d 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -19,15 +19,15 @@ ./node.nix ]; + nixpkgs.overlays = [ + (import ./wesher.nix) + ]; + # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config # replicates the default behaviour. networking.useDHCP = false; - nixpkgs.overlays = [ - (import ./wesher.nix) - ]; - # Set your time zone. time.timeZone = "Europe/Paris"; diff --git a/nix/wesher.nix b/nix/wesher.nix index 81be055..c39a3e6 100644 --- a/nix/wesher.nix +++ b/nix/wesher.nix @@ -1,23 +1,25 @@ -pkgs: -pkgs.buildGoModule rec { - pname = "wesher"; - version = "0.2.6"; +self: super: +{ + wesher = super.buildGoModule rec { + pname = "wesher"; + version = "0.2.6"; - src = pkgs.fetchFromGitHub { - owner = "costela"; - repo = "wesher"; - rev = "v${version}"; - sha256 = "1fnclr556avxay6pvgw5ya3xbxfnf2gv4njq2hr4fd6fcjyslq5h"; - }; + src = super.fetchFromGitHub { + owner = "costela"; + repo = "wesher"; + rev = "v${version}"; + sha256 = "1iagmnw2yf15r0fpikk610w0lm0gcxw83lcwfjyr2jv1q2ys71hh"; + }; - vendorSha256 = null; + vendorSha256 = "0nyg0wzn8d4rzjs8yrxxj3gha94043ll80s1ql0fml025q2f3705"; - checkPhase = "true"; + checkPhase = "true"; - meta = with pkgs.lib; { - description = "wireguard overlay mesh network manager"; - homepage = "https://github.com/costela/wesher"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + meta = with super.lib; { + description = "wireguard overlay mesh network manager"; + homepage = "https://github.com/costela/wesher"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; }; } -- cgit v1.2.3