diff options
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/networking/ddclient.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/k0sctl/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/tools/networking/ddclient/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 44 insertions, 2 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef102e3a7a3..defe8bf6a92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7530,6 +7530,12 @@ githubId = 1665818; name = "Philipp Eder"; }; + nickcao = { + name = "Nick Cao"; + email = "nickcao@nichi.co"; + github = "NickCao"; + githubId = 15247171; + }; nickhu = { email = "me@nickhu.co.uk"; github = "nickhu"; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 053efe71270..7820eedd932 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -18,6 +18,7 @@ let ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} ssl=${boolToStr cfg.ssl} wildcard=YES + ipv6=${boolToStr cfg.ipv6} quiet=${boolToStr cfg.quiet} verbose=${boolToStr cfg.verbose} ${cfg.extraConfig} @@ -116,7 +117,15 @@ with lib; default = true; type = bool; description = '' - Whether to use to use SSL/TLS to connect to dynamic DNS provider. + Whether to use SSL/TLS to connect to dynamic DNS provider. + ''; + }; + + ipv6 = mkOption { + default = false; + type = bool; + description = '' + Whether to use IPv6. ''; }; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix new file mode 100644 index 00000000000..59530f05457 --- /dev/null +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "k0sctl"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "k0sproject"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aW7x2XfeFU0z3lwPTsDHudHjdwTtfASgrbKGddVb6Rs="; + }; + + vendorSha256 = "sha256-bsXXWyeZXZLV6igEvyvPpS92FruGiLDx/5CCTKPe0EU="; + + meta = with lib; { + description = "A bootstrapping and management tool for k0s clusters."; + homepage = "https://k0sproject.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 72daa0608a6..e4bb685b518 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { # perl packages by default get devdoc which isn't present outputs = [ "out" ]; - buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP ]; + buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP IOSocketInet6 ]; # Use iproute2 instead of ifconfig preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c2c30abed8..55830f89b56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13736,6 +13736,8 @@ in augustus = callPackage ../games/augustus { }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; + k2tf = callPackage ../development/tools/misc/k2tf { }; kafkacat = callPackage ../development/tools/kafkacat { }; |