diff --git a/release.nix b/release.nix index 0a98db50..0c568694 100644 --- a/release.nix +++ b/release.nix @@ -17,8 +17,23 @@ let src = hydraSrc; inherit officialRelease; + buildInputs = [zip unzip]; + + jquery = fetchurl { + url = http://jqueryjs.googlecode.com/files/jquery-1.2.6.pack.js; + sha1 = "c10dbe0c2b23444d0794f3376398702d84f41583"; + }; + + tablesorter = fetchurl { + url = http://tablesorter.com/jquery.tablesorter.zip; + sha256 = "013zgglvifvy0yg0ybjrl823sswy9v1ihf5nmighmcyigfd6nrhb"; + }; + # Since we don't have a `make dist', just tar everything. distPhase = '' + cp $jquery src/Hydra/root/static/js/jquery-pack.js + unzip -d src/Hydra/root/static/js $tablesorter + releaseName=hydra-0.1$VERSION_SUFFIX; ensureDir $out/tarballs mkdir ../$releaseName @@ -26,6 +41,7 @@ let cd .. tar cfj $out/tarballs/$releaseName.tar.bz2 $releaseName tar cfz $out/tarballs/$releaseName.tar.gz $releaseName + zip -9r $out/tarballs/$releaseName.zip $releaseName ''; }; @@ -42,7 +58,7 @@ let name = "hydra-build"; buildInputs = [ - perl makeWrapper unzip + perl makeWrapper perlCatalystDevel perlCatalystPluginAuthenticationStoreDBIC perlCatalystPluginSessionStoreFastMmap @@ -55,22 +71,10 @@ let src=$(ls ${tarball.path}/tarballs/*.tar.bz2) ''; # */ - jquery = fetchurl { - url = http://jqueryjs.googlecode.com/files/jquery-1.2.6.pack.js; - sha1 = "c10dbe0c2b23444d0794f3376398702d84f41583"; - }; - - tablesorter = fetchurl { - url = http://tablesorter.com/jquery.tablesorter.zip; - sha256 = "013zgglvifvy0yg0ybjrl823sswy9v1ihf5nmighmcyigfd6nrhb"; - }; - installPhase = '' ensureDir $out/libexec cp -prd src/Hydra $out/libexec/hydra - cp $jquery $out/libexec/hydra/root/static/js/jquery-pack.js - unzip -d $out/libexec/hydra/root/static/js $tablesorter mv $out/libexec/hydra/script $out/bin