Unverified Commit b38cdcc5 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

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

parents 6cdf7c60 f658d8ee

pkgs/tools/package-management/nix-eval-jobs/default.nix

+12 −4
Original line number Diff line number Diff line 
{

  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";

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -15748,7 +15748,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;