nix-eval-jobs: 2.22.0 -> 2.22.1
This mainly fixes various macOS issues, so we can get rid of 2.19.
This commit is contained in:
parent
b4eaf50471
commit
0394bcf6cb
@ -1,47 +0,0 @@
|
|||||||
{ 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";
|
|
||||||
};
|
|
||||||
}
|
|
@ -4,6 +4,7 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
|
, curl
|
||||||
, nix
|
, nix
|
||||||
, nlohmann_json
|
, nlohmann_json
|
||||||
, pkg-config
|
, pkg-config
|
||||||
@ -11,16 +12,17 @@
|
|||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nix-eval-jobs";
|
pname = "nix-eval-jobs";
|
||||||
version = "2.22.0";
|
version = "2.22.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-Foi9FUuwKBUVExR3uEJEGsNRCGkkoNDj0yEhASanGCM=";
|
hash = "sha256-zvi2YfvlOLtui2JFhPs2qybpnJR3/2luMfp8t/eMh54=";
|
||||||
};
|
};
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
nix
|
nix
|
||||||
|
curl
|
||||||
nlohmann_json
|
nlohmann_json
|
||||||
];
|
];
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -39455,14 +39455,9 @@ with pkgs;
|
|||||||
|
|
||||||
dnadd = callPackage ../tools/nix/dnadd { };
|
dnadd = callPackage ../tools/nix/dnadd { };
|
||||||
|
|
||||||
nix-eval-jobs = if stdenv.isDarwin then
|
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
|
||||||
callPackage ../tools/package-management/nix-eval-jobs/2.19.nix {
|
nix = nixVersions.nix_2_22;
|
||||||
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 { };
|
nix-doc = callPackage ../tools/package-management/nix-doc { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user