From 046125bd1d9adfdaeaaed10aee19435d7f1eeffc Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 14 Jan 2011 14:47:48 +0000 Subject: [PATCH] add hydra svn path=/nixpkgs/trunk/; revision=25567 --- pkgs/development/tools/misc/hydra/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ pkgs/top-level/perl-packages.nix | 13 +++- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/hydra/default.nix diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix new file mode 100644 index 00000000000..95cf6de8ec0 --- /dev/null +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -0,0 +1,64 @@ +{stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool, +unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite, +subversion, openssh, coreutils, findutils, gzip, bzip2, lzma, +gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit +}: + +let + perldeps = with perlPackages; [ + CatalystDevel + CatalystPluginSessionStoreFastMmap + CatalystPluginStackTrace + CatalystPluginAuthorizationRoles + CatalystAuthenticationStoreDBIxClass + CatalystViewTT + CatalystEngineHTTPPrefork + CatalystViewDownload + XMLSimple + IPCRun + IOCompressBzip2 + Readonly + DBDPg + EmailSender + TextTable + NetTwitterLite + PadWalker + DataDump + JSONXS + DateTime + DigestSHA1 + CryptRandPasswd + nixPerl + ]; +in + +stdenv.mkDerivation rec { + name = "hydra-${version}"; + version = "0.1pre25566"; + src = fetchurl { + url = http://hydra.nixos.org/build/858318/download/1/hydra-0.1pre25566.tar.gz; + sha256 = "6b2dc48d609a69dec117debbd185d71bfb092bc7078f8ca59e29aaf3c9591ca7"; + }; + + configureFlags = "--with-nix=${nix}"; + + buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ; + + hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ + libxslt sqlite subversion openssh nix coreutils findutils + gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz + rpm dpkg cdrkit])); + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i \ + --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ + --prefix PATH ':' $out/bin:$hydraPath \ + --set HYDRA_RELEASE ${version} \ + --set HYDRA_HOME $out/libexec/hydra \ + --set NIX_RELEASE ${nix.name} + done + ''; # */ + +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ca6cfa308e..2d8c610e31a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -778,6 +778,10 @@ let httpfs2 = callPackage ../tools/filesystems/httpfs { }; + hydra = callPackage ../development/tools/misc/hydra { + nix = nixSqlite ; + }; + iasl = callPackage ../development/compilers/iasl { }; idutils = callPackage ../tools/misc/idutils { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d0275c4a20..355e76a9034 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9,7 +9,7 @@ rec { - inherit (pkgs) buildPerlPackage fetchurl stdenv perl; + inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn; ack = buildPerlPackage rec { name = "ack-1.92"; @@ -2019,6 +2019,17 @@ rec { propagatedBuildInputs = [JSONAny Encode LWP CryptSSLeay]; }; + nixPerl = buildPerlPackage { + name = "Nix-0.15"; + src = fetchsvn { + url = https://svn.nixos.org/repos/nix/nix-perl/trunk; + rev = 24774; + sha256 = "1akj695gpnbrjlnwd1gdnnnk7ppvpp1qsinjn04az7q6hjqzbm6p"; + }; + NIX_PREFIX = pkgs.nixSqlite; + doCheck = false; # tests currently don't work + }; + ObjectSignature = buildPerlPackage { name = "Object-Signature-1.05"; src = fetchurl {