From a553fdfa345a507d99fcf1a411cf0da7a3a6bd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Oct 2023 11:26:09 +0200 Subject: [PATCH] use nix-eval-jobs from nixpkgs --- buildbot_nix/buildbot_nix.py | 8 +------- nix/worker.nix | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/buildbot_nix/buildbot_nix.py b/buildbot_nix/buildbot_nix.py index 1afdde0..9fa56ae 100644 --- a/buildbot_nix/buildbot_nix.py +++ b/buildbot_nix/buildbot_nix.py @@ -433,13 +433,7 @@ def nix_eval_config( name="evaluate flake", supported_systems=supported_systems, command=[ - "nix", - "run", - "--option", - "accept-flake-config", - "true", - "github:nix-community/nix-eval-jobs", - "--", + "nix-eval-jobs", "--workers", multiprocessing.cpu_count(), "--max-memory-size", diff --git a/nix/worker.nix b/nix/worker.nix index 57b7e6e..8f968f0 100644 --- a/nix/worker.nix +++ b/nix/worker.nix @@ -53,6 +53,7 @@ in pkgs.openssh pkgs.gh pkgs.nix + pkgs.nix-eval-jobs ]; environment.PYTHONPATH = "${python.withPackages (_: [cfg.package])}/${python.sitePackages}"; environment.MASTER_URL = ''tcp:host=localhost:port=9989'';