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

Merge pull request #322154 from Mic92/nix-eval-jobs 

nix-eval-jobs: 2.22.0 -> 2.22.1
parents 0645ee4c 0394bcf6

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

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
{ lib

, boost

, cmake

, fetchFromGitHub

, meson

, ninja

, nix

, nlohmann_json

, pkg-config

, stdenv

}:

stdenv.mkDerivation rec {

  pname = "nix-eval-jobs";

  version = "2.19.4";

  src = fetchFromGitHub {

    owner = "nix-community";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-97ZqhTMqnAr1rzEy96faceWzFyWexnYbH1aTfc1y0JE=";

  };

  buildInputs = [

    boost

    nix

    nlohmann_json

  ];

  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    # nlohmann_json can be only discovered via cmake files

    cmake

  ];



  # 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; };



  meta = {

    description = "Hydra's builtin hydra-eval-jobs as a standalone";

    homepage = "https://github.com/nix-community/nix-eval-jobs";

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [ adisbladis mic92 ];

    platforms = lib.platforms.unix;

    mainProgram = "nix-eval-jobs";

  };

}

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

+4 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, fetchFromGitHub

, meson

, ninja

, curl

, nix

, nlohmann_json

, pkg-config
@@ -11,16 +12,17 @@ 
}:

stdenv.mkDerivation rec {

  pname = "nix-eval-jobs";

  version = "2.22.0";

  version = "2.22.1";

  src = fetchFromGitHub {

    owner = "nix-community";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-Foi9FUuwKBUVExR3uEJEGsNRCGkkoNDj0yEhASanGCM=";

    hash = "sha256-zvi2YfvlOLtui2JFhPs2qybpnJR3/2luMfp8t/eMh54=";

  };

  buildInputs = [

    boost

    nix

    curl

    nlohmann_json

  ];

  nativeBuildInputs = [

pkgs/top-level/all-packages.nix

+3 −8
Original line number Diff line number Diff line
@@ -39447,12 +39447,7 @@ with pkgs; 














  dnadd = callPackage ../tools/nix/dnadd { };



























  nix-eval-jobs = if stdenv.isDarwin then













    callPackage ../tools/package-management/nix-eval-jobs/2.19.nix {













      nix = nixVersions.nix_2_19;













    }













  else













    callPackage ../tools/package-management/nix-eval-jobs {













  nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {















    nix = nixVersions.nix_2_22;















  };