diff --git a/module/default.nix b/module/default.nix index 854812cbbebb6a15e59c23a959b868c1123dcecc..ef6f05259f55a14842bdd3ccd4396eae2b8aa245 100644 --- a/module/default.nix +++ b/module/default.nix @@ -36,13 +36,6 @@ example = "myapp"; }; lib, -{ - type = lib.types.bool; - default = false; - description = "Enable funnel mode"; - }; - - lib, ... type = lib.types.port; default = 443; @@ -97,7 +90,6 @@ lib.optionals (instanceCfg.backend != null) [ "--backend=${instanceCfg.backend}" ] ++ [ - (lib.optionalString instanceCfg.funnel "--funnel") "--hostname=${instanceCfg.hostname}" "--listen-port=${builtins.toString instanceCfg.port}" "--mount-path=${instanceCfg.mountPath}" diff --git a/pkg/default.nix b/pkg/default.nix index 79fba844bd10d767dde614d3464c5c0b5474eed8..dbe8d717d3f6a5e5e059d135d2b6daee3345e864 100644 --- a/pkg/default.nix +++ b/pkg/default.nix @@ -1,17 +1,17 @@ {pkgs ? import }: -pkgs.buildGoModule rec { +pkgs.buildGo121Module rec { pname = "tsnet-serve"; - version = "1.1.1"; + version = "493154b5d8d2a9667fa0b46b997cd8f119730657"; src = pkgs.fetchFromGitHub { owner = "shayne"; repo = pname; - rev = "v${version}"; + rev = version; - sha256 = "sha256-ww/ENlh1TQYJFdJbOxievJlPEkZ/h3K7VTd+ehRni+0="; + sha256 = "sha256-xLMskNe4kba2aXxYJiEBXf10JPA5+1EwUjUlVnOIRbs="; }; -{pkgs ? import }: pkgs.buildGoModule rec { + pname = "tsnet-serve"; CGO_ENABLED = 0;