aboutsummaryrefslogtreecommitdiff
path: root/release.nix
diff options
context:
space:
mode:
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/release.nix b/release.nix
index 2851ff39c..4f3e5fac0 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
-{ nixpkgs ? ../nixpkgs
-, nix ? { outPath = ./.; rev = 1234; }
+{ nixpkgs ? <nixpkgs>, nixos ? <nixos>
+, nix ? { outPath = ../nix-export; rev = 1234; }
, officialRelease ? false
}:
@@ -140,6 +140,15 @@ let
deb_ubuntu1010x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1010x86_64) 50;
+ # System tests.
+ tests.remote_builds = (import ./tests/remote-builds.nix rec {
+ inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
+ }).test;
+
+ tests.nix_copy_closure = (import ./tests/nix-copy-closure.nix rec {
+ inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
+ }).test;
+
};
@@ -155,7 +164,7 @@ let
name = "nix-rpm-${diskImage.name}";
src = jobs.tarball;
diskImage = (diskImageFun vmTools.diskImageFuns)
- { extraPackages = [ "perl-DBD-SQLite" ]; };
+ { extraPackages = [ "perl-DBD-SQLite" "perl-devel" ]; };
memSize = 1024;
meta.schedulingPriority = prio;
};