remove <nix/config.nix> usages

This was removed in nixUnstable.

ofborg/src/nix.rs

@@ -390,6 +390,9 @@ mod tests {
     const SYSTEM: &str = "x86_64-darwin";
 
     fn nix() -> Nix {
+        let path = env::var("PATH").unwrap();
+        let test_path = format!("{}/test-nix/bin:{}", env!("CARGO_MANIFEST_DIR"), path);
+        env::set_var("PATH", test_path);
         let remote = env::var("NIX_REMOTE").unwrap_or("".to_owned());
         Nix::new(SYSTEM.to_owned(), remote, 1800, None)
     }
@@ -612,12 +615,7 @@ mod tests {
     #[test]
     fn safe_command_custom_gc() {
         let remote = env::var("NIX_REMOTE").unwrap_or("".to_owned());
-        let nix = Nix::new(
+        let nix = Nix::new(SYSTEM.to_owned(), remote, 1800, Some("4g".to_owned()));
-            SYSTEM.to_owned(),
-            remote,
-            1800,
-            Some("4g".to_owned()),
-        );
 
         let ret: Result<fs::File, fs::File> = nix.run(
             nix.safe_command::<&OsStr>(&env_noop(), build_path().as_path(), &[], &[]),
@@ -824,10 +822,7 @@ mod tests {
         assert_run(
             ret,
             Expect::Fail,
-            vec![
+            vec!["access to path", "is forbidden in restricted mode"],
-                "access to path",
-                "is forbidden in restricted mode",
-            ],
         );
     }
 

ofborg/test-nix/bin/nix-build

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+export PATH=${PATH#*:}
+exec nix-build "$@" -I "ofborg-test-bash=$(command -v bash)"

ofborg/test-nix/bin/nix-instantiate

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+export PATH=${PATH#*:}
+exec nix-instantiate "$@" -I "ofborg-test-bash=$(command -v bash)"

ofborg/test-srcs/build-pr/default.nix

@@ -1,27 +1,25 @@
 let
-  nix = import <nix/config.nix>;
+  builder = builtins.storePath <ofborg-test-bash>;
 in {
   success = derivation {
     name = "success";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; printf '1\n2\n3\n4\n'; echo ${toString builtins.currentTime} > $out" ];
-      "-c"
-      "echo hi; printf '1\n2\n3\n4\n'; echo ${toString builtins.currentTime} > $out" ];
   };
 
   failed = derivation {
     name = "failed";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime}" ];
-      "-c"
-      "echo hi; echo ${toString builtins.currentTime}" ];
   };
 
   sandbox-violation = derivation {
     name = "sandbox-violation";
     system = builtins.currentSystem;
-    builder = ./../../src;
+    inherit builder;
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ];
+    src = ./../../src;
   };
 }

ofborg/test-srcs/build/default.nix

@@ -1,27 +1,27 @@
 let
-  nix = import <nix/config.nix>;
+  builder = builtins.storePath <ofborg-test-bash>;
-in {
+in
+
+{
   success = derivation {
     name = "success";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ];
-      "-c"
-      "echo hi; echo ${toString builtins.currentTime} > $out" ];
   };
 
   failed = derivation {
     name = "failed";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime}" ];
-      "-c"
-      "echo hi; echo ${toString builtins.currentTime}" ];
   };
 
   sandbox-violation = derivation {
     name = "sandbox-violation";
     system = builtins.currentSystem;
-    builder = ./../../src;
+    src = ./../../src;
+    inherit builder;
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ];
   };
 }

ofborg/test-srcs/eval-mixed-failure/default.nix

@@ -3,7 +3,7 @@ let
     error: access to path '/fake' is forbidden in restricted mode
   '' false; path);
 
-  nix = import <nix/config.nix>;
+  builder = builtins.storePath <ofborg-test-bash>;
 in
 
 { nixpkgs ? fetchGit /fake }:
@@ -12,37 +12,29 @@ rec {
   success = derivation {
     name = "success";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ];
-      "-c"
-      "echo hi; echo ${toString builtins.currentTime} > $out" ];
   };
 
   failed = derivation {
     name = "failed";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ];
-      "-c"
-      "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ];
   };
 
   passes-instantiation = derivation {
     name = "passes-instantiation";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo this ones cool" ];
-      "-c"
-      "echo this ones cool" ];
   };
 
   nixpkgs-restricted-mode = derivation {
     name = "nixpkgs-restricted-mode-fetchgit";
     system = builtins.currentSystem;
-    builder = nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString nixpkgs} > $out" ];
-      "-c"
-      "echo hi; echo ${toString nixpkgs} > $out" ];
   };
 
   fails-instantiation = assert builtins.trace ''

ofborg/test-srcs/eval/default.nix

@@ -1,21 +1,19 @@
 let
-  nix = import <nix/config.nix>;
+  builder = builtins.storePath <ofborg-test-bash>;
-in rec {
+in
+
+rec {
   success = derivation {
     name = "success";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime} > $out" ];
-      "-c"
-      "echo hi; echo ${toString builtins.currentTime} > $out" ];
   };
 
   failed = derivation {
     name = "failed";
     system = builtins.currentSystem;
-    builder = builtins.storePath nix.shell;
+    inherit builder;
-    args = [
+    args = ["-c" "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ];
-      "-c"
-      "echo hi; echo ${toString builtins.currentTime}; echo ${success}" ];
   };
 }