-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
45 changed files
with
667 additions
and
353 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17189,6 +17189,12 @@ | |
| githubId = 7820716; | ||
| name = "orthros"; | ||
| }; | ||
| osbm = { | ||
| email = "[email protected]"; | ||
| github = "osbm"; | ||
| githubId = 74963545; | ||
| name = "Osman Bayram"; | ||
| }; | ||
| osener = { | ||
| email = "[email protected]"; | ||
| github = "ozanmakes"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| { | ||
| config, | ||
| lib, | ||
| pkgs, | ||
| ... | ||
| }: | ||
| let | ||
| inherit (lib) | ||
| getExe | ||
| mkIf | ||
| mkEnableOption | ||
| mkOption | ||
| mkPackageOption | ||
| types | ||
| ; | ||
| cfg = config.services.zwave-js-ui; | ||
| in | ||
| { | ||
| options.services.zwave-js-ui = { | ||
| enable = mkEnableOption "zwave-js-ui"; | ||
|
|
||
| package = mkPackageOption pkgs "zwave-js-ui" { }; | ||
|
|
||
| serialPort = mkOption { | ||
| type = types.path; | ||
| description = '' | ||
| Serial port for the Z-Wave controller. | ||
| Only used to grant permissions to the device; must be additionally configured in the application | ||
| ''; | ||
| example = "/dev/serial/by-id/usb-example"; | ||
| }; | ||
|
|
||
| settings = mkOption { | ||
| type = types.submodule { | ||
| freeformType = | ||
| with types; | ||
| attrsOf ( | ||
| nullOr (oneOf [ | ||
| str | ||
| path | ||
| package | ||
| ]) | ||
| ); | ||
|
|
||
| options = { | ||
| STORE_DIR = mkOption { | ||
| type = types.str; | ||
| default = "%S/zwave-js-ui"; | ||
| visible = false; | ||
| readOnly = true; | ||
| }; | ||
|
|
||
| ZWAVEJS_EXTERNAL_CONFIG = mkOption { | ||
| type = types.str; | ||
| default = "%S/zwave-js-ui/.config-db"; | ||
| visible = false; | ||
| readOnly = true; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| description = '' | ||
| Extra environment variables passed to the zwave-js-ui process. | ||
| Check <https://zwave-js.github.io/zwave-js-ui/#/guide/env-vars> for possible options | ||
| ''; | ||
| example = { | ||
| HOST = "::"; | ||
| PORT = "8091"; | ||
| }; | ||
| }; | ||
| }; | ||
| config = mkIf cfg.enable { | ||
| systemd.services.zwave-js-ui = { | ||
| environment = cfg.settings; | ||
| wantedBy = [ "multi-user.target" ]; | ||
| serviceConfig = { | ||
| ExecStart = getExe cfg.package; | ||
| RuntimeDirectory = "zwave-js-ui"; | ||
| StateDirectory = "zwave-js-ui"; | ||
| RootDirectory = "%t/zwave-js-ui"; | ||
| BindReadOnlyPaths = [ | ||
| "/nix/store" | ||
| ]; | ||
| DeviceAllow = [ cfg.serialPort ]; | ||
| DynamicUser = true; | ||
| SupplementaryGroups = [ "dialout" ]; | ||
| CapabilityBoundingSet = [ "" ]; | ||
| RestrictAddressFamilies = "AF_INET AF_INET6"; | ||
| DevicePolicy = "closed"; | ||
| LockPersonality = true; | ||
| MemoryDenyWriteExecute = false; | ||
| NoNewPrivileges = true; | ||
| PrivateUsers = true; | ||
| PrivateTmp = true; | ||
| ProtectClock = true; | ||
| ProtectControlGroups = true; | ||
| ProtectHome = true; | ||
| ProtectHostname = true; | ||
| ProtectKernelLogs = true; | ||
| ProtectKernelModules = true; | ||
| ProtectKernalTunables = true; | ||
| ProtectProc = "invisible"; | ||
| ProcSubset = "pid"; | ||
| RemoveIPC = true; | ||
| RestrictNamespaces = true; | ||
| RestrictRealtime = true; | ||
| RestrictSUIDSGID = true; | ||
| SystemCallArchitectures = "native"; | ||
| SystemCallFilter = [ | ||
| "@system-service @pkey" | ||
| "~@privileged @resources" | ||
| ]; | ||
| UMask = "0077"; | ||
| }; | ||
| }; | ||
| }; | ||
| meta.maintainers = with lib.maintainers; [ cdombroski ]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import ./make-test-python.nix ( | ||
| { lib, ... }: | ||
| { | ||
| name = "zwave-js-ui"; | ||
| meta.maintainers = with lib.maintainers; [ cdombroski ]; | ||
|
|
||
| nodes = { | ||
| machine = | ||
| { ... }: | ||
| { | ||
| services.zwave-js-ui = { | ||
| enable = true; | ||
| serialPort = "/dev/null"; | ||
| settings = { | ||
| HOST = "::"; | ||
| PORT = "9999"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| testScript = '' | ||
| start_all() | ||
| machine.wait_for_unit("zwave-js-ui.service") | ||
| machine.wait_for_open_port(9999) | ||
| machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js-ui --grep 'Listening on port 9999host :: protocol HTTP'") | ||
| machine.wait_for_file("/var/lib/zwave-js-ui/nodes.json") | ||
| ''; | ||
| } | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 11 additions & 11 deletions
22
pkgs/applications/networking/cluster/rke2/latest/versions.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| { | ||
| rke2Version = "1.31.1+rke2r1"; | ||
| rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613"; | ||
| rke2TarballHash = "sha256-9ZryOX6QMNpjDtsOXLOVNPjCc6AMAa+XDLOn1EpyCcg="; | ||
| rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI="; | ||
| k8sVersion = "v1.31.1"; | ||
| k8sImageTag = "v1.31.1-rke2r1-build20240912"; | ||
| etcdVersion = "v3.5.13-k3s1-build20240910"; | ||
| rke2Version = "1.32.0+rke2r1"; | ||
| rke2Commit = "1182e7eb91b27b1686e69306eb2e227928a27a38"; | ||
| rke2TarballHash = "sha256-mmHQxiNcfgZTTdYPJPO7WTIlaCRM4CWsWwfRUcAR8ho="; | ||
| rke2VendorHash = "sha256-6Y3paEQJ8yHzONqalzoe15TjWhF3zGsM92LS1AcJ2GM="; | ||
| k8sVersion = "v1.32.0"; | ||
| k8sImageTag = "v1.32.0-rke2r1-build20241212"; | ||
| etcdVersion = "v3.5.16-k3s1-build20241106"; | ||
| pauseVersion = "3.6"; | ||
| ccmVersion = "v1.31.0-build20240910"; | ||
| dockerizedVersion = "v1.31.1-rke2r1"; | ||
| golangVersion = "go1.22.6"; | ||
| eol = "2025-10-28"; | ||
| ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101"; | ||
| dockerizedVersion = "v1.32.0-rke2r1"; | ||
| golangVersion = "go1.23.3"; | ||
| eol = "2026-02-28"; | ||
| } |
22 changes: 11 additions & 11 deletions
22
pkgs/applications/networking/cluster/rke2/stable/versions.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| { | ||
| rke2Version = "1.30.5+rke2r1"; | ||
| rke2Commit = "0c83bc82315cd61664880d0b52a7e070e9fbd623"; | ||
| rke2TarballHash = "sha256-K5e7TNlL97PQ13IYnr4PSrXb4XaGJT9bPq55iWL0m1g="; | ||
| rke2VendorHash = "sha256-QIcVyWnedKNF10OqJ2WmZqZeKA+8hvwDQ4Pl+WUOEJY="; | ||
| k8sVersion = "v1.30.5"; | ||
| k8sImageTag = "v1.30.5-rke2r1-build20240912"; | ||
| etcdVersion = "v3.5.13-k3s1-build20240910"; | ||
| rke2Version = "1.31.4+rke2r1"; | ||
| rke2Commit = "5142beec71f7a61804840df5b434c2fd7137ce82"; | ||
| rke2TarballHash = "sha256-Lebi3a7kNA9IQCVVkYfUoGEeEiLScqpOx1aTCFElDvw="; | ||
| rke2VendorHash = "sha256-DGmu1vFNcu1O2wuEwRZRBTL/TP2lJ9ggQ2M/Ix+jknM="; | ||
| k8sVersion = "v1.31.4"; | ||
| k8sImageTag = "v1.31.4-rke2r1-build20241212"; | ||
| etcdVersion = "v3.5.16-k3s1-build20241106"; | ||
| pauseVersion = "3.6"; | ||
| ccmVersion = "v1.30.4-build20240910"; | ||
| dockerizedVersion = "v1.30.5-rke2r1"; | ||
| golangVersion = "go1.22.6"; | ||
| eol = "2025-06-28"; | ||
| ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016"; | ||
| dockerizedVersion = "v1.31.4-rke2r1"; | ||
| golangVersion = "go1.22.9"; | ||
| eol = "2025-10-28"; | ||
| } |
Oops, something went wrong.