Merge pull request #372 from nix-community/pty

Prepare color support

Author: Mic92

buildbot_nix/buildbot_nix/__init__.py

@@ -836,6 +836,7 @@ def __init__(
         self.worker_names = worker_names
         self.post_build_steps = post_build_steps
         self.branch_config_dict = branch_config_dict
+        self.outputs_path = outputs_path
 
         super().__init__(**kwargs)
 
@@ -1065,7 +1066,7 @@ def nix_eval_config(
     factory.addStep(
         NixEvalCommand(
             project=project,
-            env={},
+            env={"CLICOLOR_FORCE": "1"},
             name="Evaluate flake",
             supported_systems=supported_systems,
             job_report_limit=job_report_limit,
@@ -1149,7 +1150,8 @@ def nix_build_steps(
 ) -> list[steps.BuildStep]:
     out_steps = [
         NixBuildCommand(
-            env={},
+            env={"CLICOLOR_FORCE": "1"},
+            usePTY=True,
             name="Build flake attr",
             command=[
                 "nix",

buildbot_nix/buildbot_nix/models.py

@@ -343,7 +343,7 @@ class NixEvalJobSuccess(BaseModel):
     neededBuilds: list[str]  # noqa: N815
     neededSubstitutes: list[str]  # noqa: N815
     drvPath: str  # noqa: N815
-    inputDrvs: dict[str, list[str]]  # noqa: N815
+    inputDrvs: dict[str, list[str]] | None = None  # noqa: N815
     name: str
     outputs: dict[str, str]
     system: str

buildbot_nix/pyproject.toml

@@ -53,8 +53,6 @@ ignore = [
   "ARG001",
   "ARG002",
 
-  # Missing type annotation for `self` in method
-  "ANN101",
   # Dynamically typed expressions (typing.Any)
   "ANN401",
   # Trailing comma missing

nix/worker.nix

@@ -96,7 +96,7 @@ in
         pkgs.cachix
         pkgs.git
         pkgs.openssh
-        pkgs.nix
+        config.nix.package
         pkgs.bash
         pkgs.coreutils
         cfg.nixEvalJobs.package