tests/jobs/basic.nix

@@ -1,22 +1,20 @@
+with import ./config.nix;
 {  
   empty_dir = 
-    derivation {
+    mkDerivation {
       name = "empty-dir";
-      system = builtins.currentSystem;
       builder = ./empty-dir-builder.sh;
     };
 
   fails = 
-    derivation {
+    mkDerivation {
       name = "fails";
-      system = builtins.currentSystem;
       builder = ./fail.sh;
     };
 
   succeed_with_failed = 
-    derivation {
+    mkDerivation {
       name = "succeed-with-failed";
-      system = builtins.currentSystem;
       builder = ./succeed-with-failed.sh;
     };
 }

tests/jobs/build-output-as-input.nix

@@ -0,0 +1,18 @@
+with import ./config.nix;
+let
+  jobs = {
+    build1 =
+      mkDerivation {
+        name = "build1";
+        builder = ./empty-dir-builder.sh;
+      };
+
+    build2 = 
+      {build1 ? jobs.build1 }:
+      mkDerivation {
+        name = "build2";
+        builder = ./empty-dir-builder.sh;
+        inherit build1;
+      };
+  };
+in jobs

tests/jobs/bzr-checkout-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "bzr-checkout-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/bzr-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "bzr-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/config.nix.in

@@ -0,0 +1,9 @@
+rec {
+  path = "@testPath@";
+
+  mkDerivation = args:
+    derivation ({
+      system = builtins.currentSystem;
+      PATH = path;
+    } // args);
+}

tests/jobs/empty-dir-builder.sh

@@ -1 +1,3 @@
+#! /bin/sh
+
 mkdir $out

tests/jobs/fail.sh

@@ -1 +1,2 @@
+#! /bin/sh
 exit 1

tests/jobs/git-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "git-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/hg-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "hg-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/scm-builder.sh

@@ -1,2 +1,3 @@
+#! /bin/sh
 mkdir $out
 cp -v $src/* $out/

tests/jobs/succeed-with-failed.sh

@@ -1,2 +1,3 @@
+#! /bin/sh
 mkdir -p $out/nix-support/failed
 

tests/jobs/svn-checkout-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "bzr-checkout-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }

tests/jobs/svn-input.nix

@@ -1,9 +1,10 @@
+with import ./config.nix;
 { src }:
 {  
   copy = 
-    derivation {
+    mkDerivation {
       name = "svn-input";
-      system = builtins.currentSystem;
       builder = ./scm-builder.sh;
+      inherit src;
     };
 }