|
|
|
@ -1,9 +1,9 @@ |
|
|
|
|
{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub |
|
|
|
|
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub |
|
|
|
|
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx |
|
|
|
|
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt |
|
|
|
|
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json |
|
|
|
|
, 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; |
|
|
|
@ -67,17 +67,17 @@ let |
|
|
|
|
boehmgc |
|
|
|
|
]; |
|
|
|
|
}; |
|
|
|
|
in releaseTools.nixBuild rec { |
|
|
|
|
in stdenv.mkDerivation rec { |
|
|
|
|
pname = "hydra"; |
|
|
|
|
version = "2019-05-06"; |
|
|
|
|
version = "2019-08-30"; |
|
|
|
|
|
|
|
|
|
inherit stdenv; |
|
|
|
|
|
|
|
|
|
src = fetchFromGitHub { |
|
|
|
|
owner = "NixOS"; |
|
|
|
|
repo = pname; |
|
|
|
|
rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472"; |
|
|
|
|
sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9"; |
|
|
|
|
rev = "242b8b7a314759ed33f69205d26a1b7c337511e0"; |
|
|
|
|
sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84"; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
buildInputs = |
|
|
|
@ -97,13 +97,6 @@ in releaseTools.nixBuild rec { |
|
|
|
|
|
|
|
|
|
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" ]; |
|
|
|
|
|
|
|
|
|
NIX_CFLAGS_COMPILE = [ "-pthread" ]; |
|
|
|
|