Add --extra-nixpkgs-args

Author: corngood

nixpkgs_review/builddir.py

@@ -13,6 +13,8 @@
 if TYPE_CHECKING:
     import types
 
+    from .buildenv import Buildenv
+
 
 class DisableKeyboardInterrupt:
     def __enter__(self) -> None:
@@ -60,7 +62,7 @@ def create_cache_directory(name: str) -> Path | TemporaryDirectory[str]:
 
 
 class Builddir:
-    def __init__(self, name: str) -> None:
+    def __init__(self, name: str, buildenv: Buildenv) -> None:
         self.environ = os.environ.copy()
         self.directory = create_cache_directory(name)
         self._temp_directory: TemporaryDirectory[str] | None = None
@@ -75,6 +77,7 @@ def __init__(self, name: str) -> None:
         self.worktree_dir = self.path / "nixpkgs"
         self.worktree_dir.mkdir()
         self._nix_path_parts = [
+            f"nixpkgs-wrapper={buildenv.nixpkgs_wrapper}",
             f"nixpkgs={self.worktree_dir}",
             f"nixpkgs-overlays={self.overlay.path}",
         ]

nixpkgs_review/buildenv.py

@@ -4,7 +4,7 @@
 import os
 from pathlib import Path
 from tempfile import NamedTemporaryFile
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Self
 
 from .utils import die
 
@@ -23,39 +23,51 @@ def find_nixpkgs_root() -> Path | None:
 
 
 class Buildenv:
-    def __init__(self, allow_aliases: bool, extra_nixpkgs_config: str) -> None:
+    def __init__(
+        self, allow_aliases: bool, extra_nixpkgs_config: str, extra_nixpkgs_args: str
+    ) -> None:
         if not (
             extra_nixpkgs_config.startswith("{") and extra_nixpkgs_config.endswith("}")
         ):
             msg = "--extra-nixpkgs-config must start with `{` and end with `}`"
             raise RuntimeError(msg)
+        if not (
+            extra_nixpkgs_args.startswith("{") and extra_nixpkgs_args.endswith("}")
+        ):
+            msg = "--extra-nixpkgs-args must start with `{` and end with `}`"
+            raise RuntimeError(msg)
 
-        self.nixpkgs_config = NamedTemporaryFile(suffix=".nix")  # noqa: SIM115
+        self._nixpkgs_wrapper_file = NamedTemporaryFile(suffix=".nix")  # noqa: SIM115
         self.old_cwd: Path | None = None
         self.environ: dict[str, str] | None = None
         aliases_config = "allowAliases = false;" if not allow_aliases else ""
-        config_content = f"""{{
-  allowUnfree = true;
-  allowBroken = true;
-  {aliases_config}
-  checkMeta = true;
-  ## TODO: also build packages marked as insecure
-  # allowInsecurePredicate = x: true;
-}} // {extra_nixpkgs_config}
+        config_content = f"""{{...}}@args:
+let extraArgs = {extra_nixpkgs_args};
+in import <nixpkgs> ({{
+  config = {{
+    allowUnfree = true;
+    allowBroken = true;
+    {aliases_config}
+    checkMeta = true;
+    ## TODO: also build packages marked as insecure
+    # allowInsecurePredicate = x: true;
+  }} // {extra_nixpkgs_config} // extraArgs.config or {{}} // args.config or {{}};
+}} // (removeAttrs extraArgs [ "config" ]) // (removeAttrs args [ "config" ]))
 """
-        self.nixpkgs_config.write(config_content.encode())
-        self.nixpkgs_config.flush()
+        self._nixpkgs_wrapper_file.write(config_content.encode())
+        self._nixpkgs_wrapper_file.flush()
 
-    def __enter__(self) -> Path:
+    def __enter__(self) -> Self:
         self.environ = os.environ.copy()
         self.old_cwd = Path.cwd()
+        self.nixpkgs_wrapper = Path(self._nixpkgs_wrapper_file.name)
 
         if (root := find_nixpkgs_root()) is None:
             die("Has to be executed from nixpkgs repository")
         os.chdir(root)
 
-        os.environ["NIXPKGS_CONFIG"] = self.nixpkgs_config.name
-        return Path(self.nixpkgs_config.name)
+        os.environ["NIXPKGS_CONFIG"] = ""
+        return self
 
     def __exit__(
         self,
@@ -71,5 +83,5 @@ def __exit__(
             os.environ.clear()
             os.environ.update(self.environ)
 
-        if self.nixpkgs_config is not None:
-            self.nixpkgs_config.close()
+        if self._nixpkgs_wrapper_file is not None:
+            self._nixpkgs_wrapper_file.close()

nixpkgs_review/cli/__init__.py

@@ -303,6 +303,12 @@ def common_flags() -> list[CommonFlag]:
             default="{ }",
             help="Extra nixpkgs config to pass to `import <nixpkgs>`",
         ),
+        CommonFlag(
+            "--extra-nixpkgs-args",
+            type=str,
+            default="{ }",
+            help="Extra nixpkgs args to pass to `import <nixpkgs>`",
+        ),
         CommonFlag(
             "--num-parallel-evals",
             type=int,

nixpkgs_review/cli/pr.py

@@ -94,12 +94,14 @@ def pr_command(args: argparse.Namespace) -> str:
 
     builddir = None
     with (
-        Buildenv(allow.aliases, args.extra_nixpkgs_config) as nixpkgs_config,
+        Buildenv(
+            allow.aliases, args.extra_nixpkgs_config, args.extra_nixpkgs_args
+        ) as buildenv,
         ExitStack() as stack,
     ):
         review = None
         for pr in prs:
-            builddir = stack.enter_context(Builddir(f"pr-{pr}"))
+            builddir = stack.enter_context(Builddir(f"pr-{pr}", buildenv))
             try:
                 review = Review(
                     builddir=builddir,
@@ -119,8 +121,9 @@ def pr_command(args: argparse.Namespace) -> str:
                     checkout=checkout_option,
                     sandbox=args.sandbox,
                     build_graph=args.build_graph,
-                    nixpkgs_config=nixpkgs_config,
+                    nixpkgs_wrapper=buildenv.nixpkgs_wrapper,
                     extra_nixpkgs_config=args.extra_nixpkgs_config,
+                    extra_nixpkgs_args=args.extra_nixpkgs_args,
                     num_parallel_evals=args.num_parallel_evals,
                     show_header=not args.no_headers,
                     show_logs=not args.no_logs,

nixpkgs_review/cli/rev.py

@@ -14,13 +14,15 @@
 
 def rev_command(args: argparse.Namespace) -> Path:
     allow = AllowedFeatures(args.allow)
-    with Buildenv(allow.aliases, args.extra_nixpkgs_config) as nixpkgs_config:
+    with Buildenv(
+        allow.aliases, args.extra_nixpkgs_config, args.extra_nixpkgs_args
+    ) as buildenv:
         commit = git.verify_commit_hash(args.commit)
         return review_local_revision(
             f"rev-{commit}",
             args,
             allow,
-            nixpkgs_config,
+            buildenv,
             commit,
             print_result=args.print_result,
         )

nixpkgs_review/cli/wip.py

@@ -14,12 +14,14 @@
 
 def wip_command(args: argparse.Namespace) -> Path:
     allow = AllowedFeatures(args.allow)
-    with Buildenv(allow.aliases, args.extra_nixpkgs_config) as nixpkgs_config:
+    with Buildenv(
+        allow.aliases, args.extra_nixpkgs_config, args.extra_nixpkgs_args
+    ) as buildenv:
         return review_local_revision(
             f"rev-{git.verify_commit_hash('HEAD')}-dirty",
             args,
             allow,
-            nixpkgs_config,
+            buildenv,
             None,
             staged=args.staged,
             print_result=args.print_result,

nixpkgs_review/nix.py

@@ -79,7 +79,7 @@ def nix_shell(
     local_system: str,
     build_graph: str,
     nix_path: str,
-    nixpkgs_config: Path,
+    nixpkgs_wrapper: Path,
     nixpkgs_overlay: Path,
     run: str | None = None,
     *,
@@ -94,15 +94,14 @@ def nix_shell(
         cache_dir=cache_directory,
         attrs_per_system=attrs_per_system,
         local_system=local_system,
-        nixpkgs_config=nixpkgs_config,
     )
     if sandbox:
         args = _nix_shell_sandbox(
             nix_shell,
             shell_file_args,
             cache_directory,
             nix_path,
-            nixpkgs_config,
+            nixpkgs_wrapper,
             nixpkgs_overlay,
         )
     else:
@@ -117,7 +116,7 @@ def _nix_shell_sandbox(
     shell_file_args: list[str],
     cache_directory: Path,
     nix_path: str,
-    nixpkgs_config: Path,
+    nixpkgs_wrapper: Path,
     nixpkgs_overlay: Path,
 ) -> list[str]:
     if platform != "linux":
@@ -177,7 +176,7 @@ def tmpfs(path: Path | str, *, is_dir: bool = True) -> list[str]:
         *bind("/dev", dev=True),
         *tmpfs("/tmp"),  # noqa: S108
         # Required for evaluation
-        *bind(nixpkgs_config),
+        *bind(nixpkgs_wrapper),
         *bind(nixpkgs_overlay),
         # /run (also cover sockets for wayland/pulseaudio and pipewires)
         *bind(Path("/run/user").joinpath(uid), dev=True, try_=True),
@@ -332,7 +331,6 @@ def nix_build(
     allow: AllowedFeatures,
     build_graph: str,
     nix_path: str,
-    nixpkgs_config: Path,
     n_threads: int,
 ) -> dict[System, list[Attr]]:
     if not attr_names_per_system:
@@ -376,7 +374,6 @@ def nix_build(
         cache_dir=cache_directory,
         attrs_per_system=filtered_per_system,
         local_system=local_system,
-        nixpkgs_config=nixpkgs_config,
     )
     _write_review_shell_drv(
         cache_directory=cache_directory,
@@ -395,7 +392,6 @@ def build_shell_file_args(
     cache_dir: Path,
     attrs_per_system: dict[System, list[str]],
     local_system: str,
-    nixpkgs_config: Path,
 ) -> list[str]:
     attrs_file = cache_dir.joinpath("attrs.nix")
     with attrs_file.open("w+") as f:
@@ -412,12 +408,6 @@ def build_shell_file_args(
         "local-system",
         local_system,
         "--argstr",
-        "nixpkgs-path",
-        str(cache_dir.joinpath("nixpkgs/")),
-        "--argstr",
-        "nixpkgs-config-path",
-        str(nixpkgs_config),
-        "--argstr",
         "attrs-path",
         str(attrs_file),
     ]

nixpkgs_review/nix/evalAttrs.nix

@@ -2,8 +2,8 @@
 
 with builtins;
 let
-  pkgs = import <nixpkgs> {
-    config = import (getEnv "NIXPKGS_CONFIG") // {
+  pkgs = import <nixpkgs-wrapper> {
+    config = {
       allowBroken = false;
     };
   };

nixpkgs_review/nix/review-shell.nix

@@ -1,27 +1,22 @@
 {
   local-system,
-  nixpkgs-config-path,
+  nixpkgs ? <nixpkgs-wrapper>,
   # Path to Nix file containing the Nixpkgs config
   attrs-path,
-  # Path to Nix file containing a list of attributes to build
-  nixpkgs-path,
   # Path to this review's nixpkgs
-  local-pkgs ? import nixpkgs-path {
+  local-pkgs ? import <nixpkgs> {
     system = local-system;
-    config = import nixpkgs-config-path;
   },
   lib ? local-pkgs.lib,
 }:
 
 let
 
-  nixpkgs-config = import nixpkgs-config-path;
   extractPackagesForSystem =
     system: system-attrs:
     let
-      system-pkg = import nixpkgs-path {
+      system-pkg = import nixpkgs {
         inherit system;
-        config = nixpkgs-config;
       };
     in
     map (attrString: lib.attrByPath (lib.splitString "." attrString) null system-pkg) system-attrs;
@@ -38,11 +33,11 @@ let
     }
   );
 in
-(import nixpkgs-path { }).mkShell {
+(import nixpkgs { }).mkShell {
   name = "review-shell";
   preferLocalBuild = true;
   allowSubstitutes = false;
   dontWrapQtApps = true;
-  # see test_rev_command_with_pkg_count
-  packages = if builtins.length attrs > 50 then [ env ] else attrs;
+  packages = [ env ];
 }
+

nixpkgs_review/report.py

@@ -311,6 +311,7 @@ def __init__(
         commit: str | None,
         attrs_per_system: dict[str, list[Attr]],
         extra_nixpkgs_config: str,
+        extra_nixpkgs_args: str,
         only_packages: set[str],
         additional_packages: set[str],
         package_regex: list[Pattern[str]],
@@ -337,6 +338,9 @@ def __init__(
         self.extra_nixpkgs_config = (
             extra_nixpkgs_config if extra_nixpkgs_config != "{ }" else None
         )
+        self.extra_nixpkgs_args = (
+            extra_nixpkgs_args if extra_nixpkgs_args != "{ }" else None
+        )
 
         reports: dict[System, SystemReport] = {}
         for system, attrs in attrs_per_system.items():
@@ -367,6 +371,7 @@ def json(self, pr: int | None) -> str:
                 "commit": self.commit,
                 "checkout": self.checkout,
                 "extra-nixpkgs-config": self.extra_nixpkgs_config,
+                "extra-nixpkgs-args": self.extra_nixpkgs_args,
                 "only_packages": list(self.only_packages),
                 "additional_packages": list(self.additional_packages),
                 "package_regex": list(self.package_regex),
@@ -387,6 +392,8 @@ def _generate_command_string(self, pr: int | None) -> str:
             cmd += f" pr {pr}"
         if self.extra_nixpkgs_config:
             cmd += f" --extra-nixpkgs-config '{self.extra_nixpkgs_config}'"
+        if self.extra_nixpkgs_args:
+            cmd += f" --extra-nixpkgs-args '{self.extra_nixpkgs_args}'"
         if self.checkout != "merge":
             cmd += f" --checkout {self.checkout}"