diff --git a/deps.nix b/deps.nix new file mode 100644 index 00000000..14b5f1b5 --- /dev/null +++ b/deps.nix @@ -0,0 +1,19 @@ +{pkgs}: + +with pkgs; + +[ perlPackages.CatalystDevel + perlPackages.CatalystPluginSessionStoreFastMmap + perlPackages.CatalystPluginStackTrace + perlPackages.CatalystPluginAuthorizationRoles + perlPackages.CatalystAuthenticationStoreDBIxClass + perlPackages.CatalystViewTT + perlPackages.CatalystEngineHTTPPrefork + perlPackages.CatalystViewDownload + perlPackages.XMLSimple + perlPackages.IPCRun + perlPackages.IOCompressBzip2 + perlPackages.Readonly + perlPackages.DBDPg + perlPackages.EmailSend +] diff --git a/release.nix b/release.nix index d6a5d84b..4142dc72 100644 --- a/release.nix +++ b/release.nix @@ -54,30 +54,18 @@ let , system ? "i686-linux" }: - with import nixpkgs {inherit system;}; + let pkgs = import nixpkgs {inherit system;}; in + + with pkgs; let nix = nixUnstable.override { supportOldDBs = false; }; in stdenv.mkDerivation { name = "hydra" + (if tarball ? version then "-" + tarball.version else ""); - buildInputs = [ - perl makeWrapper - perlPackages.CatalystDevel - perlPackages.CatalystPluginSessionStoreFastMmap - perlPackages.CatalystPluginStackTrace - perlPackages.CatalystPluginAuthorizationRoles - perlPackages.CatalystAuthenticationStoreDBIxClass - perlPackages.CatalystViewTT - perlPackages.CatalystEngineHTTPPrefork - perlPackages.CatalystViewDownload - perlPackages.XMLSimple - perlPackages.IPCRun - perlPackages.IOCompressBzip2 - perlPackages.Readonly - perlPackages.DBDPg - libtool - ]; + buildInputs = + [ perl makeWrapper libtool ] + ++ (import ./deps.nix) { inherit pkgs; }; preUnpack = '' src=$(ls ${tarball}/tarballs/*.tar.bz2)