diff --git a/deps.nix b/deps.nix index 1c5b7ec3..46d7783c 100644 --- a/deps.nix +++ b/deps.nix @@ -2,6 +2,21 @@ with pkgs; +let + + nixPerl = buildPerlPackage { + name = "Nix-0.15"; + src = fetchsvn { + url = https://svn.nixos.org/repos/nix/nix-perl/trunk; + rev = 20373; + sha256 = "153wj8kcdf9hzg89bjm8s8d6byrhcw0dazzrwc04a7g79j5xjfaj"; + }; + NIX_PREFIX = nixSqlite; + doCheck = false; # tests currently don't work + }; + +in + [ perlPackages.CatalystDevel perlPackages.CatalystPluginSessionStoreFastMmap perlPackages.CatalystPluginStackTrace @@ -20,5 +35,5 @@ with pkgs; perlPackages.NetTwitterLite perlPackages.PadWalker perlPackages.DataDump + nixPerl ] - diff --git a/release.nix b/release.nix index 22ca2cfb..4a8f7ff3 100644 --- a/release.nix +++ b/release.nix @@ -6,7 +6,7 @@ let tarball = { hydraSrc ? {outPath = ./.; rev = 1234;} - , nixpkgs ? ../../nixpkgs + , nixpkgs ? ../nixpkgs , officialRelease ? false }: @@ -59,15 +59,15 @@ let build = { tarball ? jobs.tarball {} - , nixpkgs ? ../../nixpkgs - , system ? "i686-linux" + , nixpkgs ? ../nixpkgs + , system ? "x86_64-linux" }: let pkgs = import nixpkgs {inherit system;}; in with pkgs; - let nix = nixUnstable; in + let nix = nixSqlite; in stdenv.mkDerivation { name = "hydra" + (if tarball ? version then "-" + tarball.version else "");