From 0790db7258075257281594bfd80fc791c903d301 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 10 Jan 2025 13:18:12 +0100 Subject: [PATCH 1/2] Fix: f-string in generator error --- nixosModules/clanCore/zerotier/generate.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixosModules/clanCore/zerotier/generate.py b/nixosModules/clanCore/zerotier/generate.py index 8f6125017..1b1e1b91f 100644 --- a/nixosModules/clanCore/zerotier/generate.py +++ b/nixosModules/clanCore/zerotier/generate.py @@ -55,9 +55,9 @@ class Identity: def node_id(self) -> str: nid = self.public.split(":")[0] - assert len(nid) == 10, ( - f"node_id must be 10 characters long, got {len(nid)}: {nid}" - ) + assert ( + len(nid) == 10 + ), f"node_id must be 10 characters long, got {len(nid)}: {nid}" return nid @@ -172,9 +172,9 @@ def create_identity() -> Identity: def compute_zerotier_ip(network_id: str, identity: Identity) -> ipaddress.IPv6Address: - assert len(network_id) == 16, ( - "network_id must be 16 characters long, got {network_id}" - ) + assert ( + len(network_id) == 16 + ), f"network_id must be 16 characters long, got '{network_id}'" nwid = int(network_id, 16) node_id = int(identity.node_id(), 16) addr_parts = bytearray( From 31a1fe887e123041a2f29b5b7e6bed17e336666c Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 14 Jan 2025 17:40:17 +0100 Subject: [PATCH 2/2] Vars: interface improve docs formatting --- nixosModules/clanCore/vars/interface.nix | 13 +++++++++---- nixosModules/clanCore/zerotier/generate.py | 12 ++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/nixosModules/clanCore/vars/interface.nix b/nixosModules/clanCore/vars/interface.nix index 20c743ce9..87c335c5a 100644 --- a/nixosModules/clanCore/vars/interface.nix +++ b/nixosModules/clanCore/vars/interface.nix @@ -60,7 +60,10 @@ in description = '' A list of other generators that this generator depends on. The output values of these generators will be available to the generator script as files. - For example, the file 'file1' of a dependency named 'dep1' will be available via $in/dep1/file1. + + For example: + + **A file `file1` of a generator named `dep1` will be available via `$in/dep1/file1`** ''; type = listOf str; default = [ ]; @@ -321,9 +324,11 @@ in description = '' The script to run to generate the files. The script will be run with the following environment variables: - - $in: The directory containing the output values of all declared dependencies - - $out: The output directory to put the generated files - - $prompts: The directory containing the prompted values as files + + - $in: The directory containing the output values of all declared dependencies + - $out: The output directory to put the generated files + - $prompts: The directory containing the prompted values as files + The script should produce the files specified in the 'files' attribute under $out. ''; type = either str path; diff --git a/nixosModules/clanCore/zerotier/generate.py b/nixosModules/clanCore/zerotier/generate.py index 1b1e1b91f..a0c6f6af9 100644 --- a/nixosModules/clanCore/zerotier/generate.py +++ b/nixosModules/clanCore/zerotier/generate.py @@ -55,9 +55,9 @@ class Identity: def node_id(self) -> str: nid = self.public.split(":")[0] - assert ( - len(nid) == 10 - ), f"node_id must be 10 characters long, got {len(nid)}: {nid}" + assert len(nid) == 10, ( + f"node_id must be 10 characters long, got {len(nid)}: {nid}" + ) return nid @@ -172,9 +172,9 @@ def create_identity() -> Identity: def compute_zerotier_ip(network_id: str, identity: Identity) -> ipaddress.IPv6Address: - assert ( - len(network_id) == 16 - ), f"network_id must be 16 characters long, got '{network_id}'" + assert len(network_id) == 16, ( + f"network_id must be 16 characters long, got '{network_id}'" + ) nwid = int(network_id, 16) node_id = int(identity.node_id(), 16) addr_parts = bytearray(