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

hydra: 2019-05-06 -> 2019-08-30

Browse Source
This commit is contained in:
Maximilian Bosch 2019-09-08 01:25:25 +02:00
parent 4149a662a7
commit b898c262c1
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook
}: }:
with stdenv; with stdenv;
@ -67,17 +67,17 @@ let
boehmgc boehmgc
]; ];
}; };
in releaseTools.nixBuild rec { in stdenv.mkDerivation rec {
pname = "hydra"; pname = "hydra";
version = "2019-05-06"; version = "2019-08-30";
inherit stdenv; inherit stdenv;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = pname; repo = pname;
rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472"; rev = "242b8b7a314759ed33f69205d26a1b7c337511e0";
sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9"; sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84";
}; };
buildInputs = buildInputs =
@ -97,13 +97,6 @@ in releaseTools.nixBuild rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
patches = [
(fetchpatch {
url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch";
sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx";
})
];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = [ "-pthread" ]; NIX_CFLAGS_COMPILE = [ "-pthread" ];