nix-eval-jobs: switch to nixComponents (#433025)

authored by Jörg Thalheim and committed by GitHub b38cdcc5 6cdf7c60

+13 -5
+12 -4
pkgs/tools/package-management/nix-eval-jobs/default.nix
··· 1 { 2 lib, 3 boost, 4 - cmake, 5 fetchFromGitHub, 6 meson, 7 ninja, 8 curl, 9 - nix, 10 nlohmann_json, 11 pkg-config, 12 stdenv, 13 }: 14 stdenv.mkDerivation rec { 15 pname = "nix-eval-jobs"; ··· 24 25 buildInputs = [ 26 boost 27 - nix 28 curl 29 nlohmann_json 30 ]; 31 32 nativeBuildInputs = [ ··· 43 # Since this package is intimately tied to a specific Nix release, we 44 # propagate the Nix used for building it to make it easier for users 45 # downstream to reference it. 46 - passthru = { inherit nix; }; 47 48 meta = { 49 description = "Hydra's builtin hydra-eval-jobs as a standalone";
··· 1 { 2 lib, 3 boost, 4 fetchFromGitHub, 5 meson, 6 ninja, 7 curl, 8 nlohmann_json, 9 pkg-config, 10 stdenv, 11 + nixComponents, 12 }: 13 stdenv.mkDerivation rec { 14 pname = "nix-eval-jobs"; ··· 23 24 buildInputs = [ 25 boost 26 curl 27 nlohmann_json 28 + nixComponents.nix-store 29 + nixComponents.nix-fetchers 30 + nixComponents.nix-expr 31 + nixComponents.nix-flake 32 + nixComponents.nix-main 33 + nixComponents.nix-cmd 34 ]; 35 36 nativeBuildInputs = [ ··· 47 # Since this package is intimately tied to a specific Nix release, we 48 # propagate the Nix used for building it to make it easier for users 49 # downstream to reference it. 50 + passthru = { 51 + inherit nixComponents; 52 + # For nix-fast-build 53 + nix = nixComponents.nix-cli; 54 + }; 55 56 meta = { 57 description = "Hydra's builtin hydra-eval-jobs as a standalone";
+1 -1
pkgs/top-level/all-packages.nix
··· 15748 ); 15749 15750 nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { 15751 - nix = nixVersions.nix_2_30; 15752 }; 15753 15754 nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;
··· 15748 ); 15749 15750 nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { 15751 + nixComponents = nixVersions.nixComponents_2_30; 15752 }; 15753 15754 nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;