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

nix-eval-jobs: 2.21.0 -> 2.22.0 (#310301) 

* nix-eval-jobs: 2.21.0 -> 2.22.0

* nix-eval-jobs: pin darwin on 2.19 release

An issue in nix causes segfaults:
https://github.com/nix-community/nix-eval-jobs/issues/301
parent 8a7f9357

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

0 → 100644
+47 −0
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

+2 −2
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ 
}:

stdenv.mkDerivation rec {

  pname = "nix-eval-jobs";

  version = "2.21.0";

  version = "2.22.0";

  src = fetchFromGitHub {

    owner = "nix-community";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-StJq7Zy+/iVBUAKFzhHWlsirFucZ3gNtzXhAYXAsNnw=";

    hash = "sha256-Foi9FUuwKBUVExR3uEJEGsNRCGkkoNDj0yEhASanGCM=";

  };

  buildInputs = [

    boost

pkgs/top-level/all-packages.nix

+8 −3
Original line number Diff line number Diff line
@@ -39712,8 +39712,13 @@ with pkgs; 














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



























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













    nix = nixVersions.nix_2_21;













  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 = nixVersions.nix_2_22;















    };





























  nix-doc = callPackage ../tools/package-management/nix-doc { };