JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hydra: 2019-03-18 -> 2019-05-06

Browse Source 
As Hydra doesn't have a release model, we have to pin git revs for our
package. The current state provides some new fixes and features like a status
plugin for GitLab.

As Nix 2.0 isn't bundled in `master` and `release-19.03` and we don't
support Nix 1.11 for Hydra, I figured that the Nix version checks could
be dropped and boost can always be used as build input.
This commit is contained in:
Maximilian Bosch 2019-05-11 18:50:47 +02:00
parent 18d0273877
commit 703a211f05
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/tools/misc/hydra/default.nix
View File

@ -13,12 +13,6 @@ if lib.versions.major nix.version == "1"
else else
let let
isGreaterNix20 = with lib.versions;
let
inherit (nix) version;
inherit (lib) toInt;
in major version == "2" && toInt (minor version) >= 1 || toInt (major version) > 2;
perlDeps = buildEnv { perlDeps = buildEnv {
name = "hydra-perl-deps"; name = "hydra-perl-deps";
paths = with perlPackages; paths = with perlPackages;
@ -74,16 +68,16 @@ let
]; ];
}; };
in releaseTools.nixBuild rec { in releaseTools.nixBuild rec {
name = "hydra-${version}"; pname = "hydra";
version = "2019-03-18"; version = "2019-05-06";
inherit stdenv; inherit stdenv;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "hydra"; repo = pname;
rev = "0721f6623ffb5a4b6a77b499af4eee7d6e4dd6a7"; rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472";
sha256 = "0b2g2bnbaqpwxx8p81i4gpl4y16i57z5pnjm90fpd0jxnkij3pcg"; sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9";
}; };
buildInputs = buildInputs =
@ -93,7 +87,8 @@ in releaseTools.nixBuild rec {
perlDeps perl nix perlDeps perl nix
postgresql # for running the tests postgresql # for running the tests
nlohmann_json nlohmann_json
] ++ lib.optionals isGreaterNix20 [ boost ]; boost
];
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz [ sqlite subversion openssh nix coreutils findutils pixz
@ -102,15 +97,7 @@ in releaseTools.nixBuild rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
# adds a patch which ensures compatibility with the API of Nix 2.0. patches = [
# it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44,
# for Nix 2.1/unstable compatibility. Reapplying helps if Nix 2.0 is used to keep the build functional.
patches = lib.optionals (!isGreaterNix20) [
(fetchpatch {
url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch";
sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8";
})
] ++ [
(fetchpatch { (fetchpatch {
url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch"; url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch";
sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx"; sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx";