add package for nixos-anywhere

Author: Mic92

pyproject.toml

@@ -0,0 +1,55 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "nixos-anywhere-pxe"
+description = "Install NixOS with PXE"
+dynamic = ["version"]
+scripts = { nixos-anywhere-pxe = "nixos_anywhere_pxe:main"}
+
+[tool.pytest.ini_options]
+addopts = "--cov . --cov-report term --cov-fail-under=100 --no-cov-on-fail"
+
+[tool.mypy]
+python_version = "3.10"
+warn_redundant_casts = true
+disallow_untyped_calls = true
+disallow_untyped_defs = true
+no_implicit_optional = true
+
+[[tool.mypy.overrides]]
+module = "setuptools.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "pytest.*"
+ignore_missing_imports = true
+
+[tool.ruff]
+line-length = 88
+
+select = ["E", "F", "I"]
+ignore = [ "E501" ]
+
+[tool.black]
+line-length = 88
+target-version = ['py310']
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+  # The following are specific to Black, you probably don't want those.
+  | blib2to3
+  | tests/data
+  | profiling
+)/
+'''

src/flake-module.nix

@@ -2,6 +2,7 @@
   perSystem = { config, pkgs, ... }: {
     packages = {
       nixos-anywhere = pkgs.callPackage ./. { };
+      nixos-anywhere-pxe = pkgs.callPackage ./nixos_anywhere_pxe { };
       default = config.packages.nixos-anywhere;
     };
     devShells.default = config.packages.nixos-anywhere.devShell;

nixos-anywhere-pxe.py renamed to src/nixos_anywhere_pxe/__init__.py

@@ -3,6 +3,7 @@
 import argparse
 import binascii
 import gzip
+import ipaddress
 import json
 import os
 import shutil
@@ -15,12 +16,12 @@
 from tempfile import TemporaryDirectory
 from typing import IO, Iterator, List, NoReturn, Optional, Tuple, Union
 
-from netaddr import AddrFormatError, IPAddress, IPNetwork
-
 FILE = Union[None, int, IO]
 
 NIXOS_ANYWHERE_SH = Path(__file__).parent.absolute() / "src/nixos-anywhere.sh"
 
+
+
 def run(
     cmd: Union[str, list[str]],
     input: Optional[str] = None,
@@ -92,7 +93,7 @@ def next_dhcp_event(self) -> Iterator[DhcpEvent]:
 # 	even if dnsmasq is configured to change UID to an unprivileged user.
 @contextmanager
 def start_dnsmasq(
-    interface: str, dhcp_range: Tuple[IPAddress, IPAddress]
+    interface: str, dhcp_range: Tuple[ipaddress.IPv4Address, ipaddress.IPv4Address]
 ) -> Iterator[Dnsmasq]:
     with TemporaryDirectory(prefix="dnsmasq.") as _temp:
         temp = Path(_temp)
@@ -151,7 +152,7 @@ def start_dnsmasq(
 
 @contextmanager
 def start_pixiecore(
-    server_ip: IPAddress,
+    server_ip: ipaddress.IPv4Address,
     port: int,
     ssh_public_key: Path,
     pxe_image_store_path: Path,
@@ -225,9 +226,9 @@ class Options:
     flake: str
     netboot_image_flake: str
     dhcp_interface: str
-    dhcp_server_ip: IPAddress
+    dhcp_server_ip: ipaddress.IPv4Address
     dhcp_subnet: int
-    dhcp_range: Tuple[IPAddress, IPAddress]
+    dhcp_range: Tuple[ipaddress.IPv4Address, ipaddress.IPv4Address]
     pixiecore_http_port: int
     pause_after_completion: bool
     nixos_anywhere_args: List[str]
@@ -276,16 +277,16 @@ def parse_args(args: list[str]) -> Options:
 
     parsed, unknown_args = parser.parse_known_args(args)
     try:
-        dhcp_subnet = IPNetwork(parsed.dhcp_subnet)
-    except AddrFormatError as e:
+        dhcp_subnet = ipaddress.ip_network(parsed.dhcp_subnet)
+    except ValueError as e:
         die(f"subnet specified in --dhcp-subnet is not valid: {e}")
 
     if dhcp_subnet.version != 4:
         die(
             "Sorry. Only ipv4 subnets are supported just now because of compatibility with older bios firmware"
         )
 
-    hosts = dhcp_subnet.iter_hosts()
+    hosts = dhcp_subnet.hosts()
     try:
         dhcp_server_ip = next(hosts)
     except StopIteration:
@@ -384,13 +385,14 @@ def build_pxe_image(netboot_image_flake: str) -> Path:
     )
     return Path(res.stdout.strip())
 
+
 def pause():
     print("")
     # no clue how to flush stdin with python. Gonna wait for a specific string instead (as opposed to wait for [enter]).
     answer = ""
-    while (answer != "continue"):
+    while answer != "continue":
         answer = input(
-                "Answer 'continue' to terminate this script and tear down the network to the server: "
+            "Answer 'continue' to terminate this script and tear down the network to the server: "
         )
 
 

src/nixos_anywhere_pxe/default.nix

@@ -0,0 +1,45 @@
+{ pkgs
+, lib
+, python3
+, ruff
+, runCommand
+}:
+let
+  src = ../..;
+
+  devDependencies = lib.attrValues {
+    inherit (pkgs) ruff;
+    inherit (python3.pkgs)
+      black
+      mypy
+      pytest
+      pytest-cov
+      pytest-subprocess
+      setuptools
+      wheel
+      ;
+  };
+
+  package = python3.pkgs.buildPythonPackage {
+    name = "nixos-anywhere-pxe";
+    inherit src;
+    format = "pyproject";
+    nativeBuildInputs = [
+      python3.pkgs.setuptools
+    ];
+    passthru.tests = { inherit nixos-anywhere-pxe-mypy; };
+    passthru.devDependencies = devDependencies;
+  };
+
+  checkPython = python3.withPackages (_ps: devDependencies);
+
+  nixos-anywhere-pxe-mypy = runCommand "nixos-anywhere-pxe-mypy" { } ''
+    cp -r ${src} ./src
+    chmod +w -R ./src
+    cd src
+    ${checkPython}/bin/mypy .
+    touch $out
+  '';
+
+in
+package