nix-eval-jobs: switch to nixComponents

this reduces nix-eval-jobs dependency closures to what it exactly uses
This commit is contained in:
Jörg Thalheim 2025-08-12 10:04:37 +02:00
parent 1e4e08809c
commit f658d8ee94
2 changed files with 13 additions and 5 deletions

View File

@ -1,15 +1,14 @@
{
lib,
boost,
cmake,
fetchFromGitHub,
meson,
ninja,
curl,
nix,
nlohmann_json,
pkg-config,
stdenv,
nixComponents,
}:
stdenv.mkDerivation rec {
pname = "nix-eval-jobs";
@ -24,9 +23,14 @@ stdenv.mkDerivation rec {
buildInputs = [
boost
nix
curl
nlohmann_json
nixComponents.nix-store
nixComponents.nix-fetchers
nixComponents.nix-expr
nixComponents.nix-flake
nixComponents.nix-main
nixComponents.nix-cmd
];
nativeBuildInputs = [
@ -43,7 +47,11 @@ stdenv.mkDerivation rec {
# Since this package is intimately tied to a specific Nix release, we
# propagate the Nix used for building it to make it easier for users
# downstream to reference it.
passthru = { inherit nix; };
passthru = {
inherit nixComponents;
# For nix-fast-build
nix = nixComponents.nix-cli;
};
meta = {
description = "Hydra's builtin hydra-eval-jobs as a standalone";

View File

@ -15766,7 +15766,7 @@ with pkgs;
);
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
nix = nixVersions.nix_2_30;
nixComponents = nixVersions.nixComponents_2_30;
};
nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;