Revert " eval-checker: use explicit 'nixpkgs' argument for release.nix expressions"

grahamc · web-flow · commit bc4c04d9ed4d · 2018-11-23T13:03:41.000-05:00
diff --git a/ofborg/src/nix.rs b/ofborg/src/nix.rs
@@ -675,7 +675,7 @@ mod tests {
     }
 
     #[test]
-    fn instantiation_success() {
+    fn instantiation() {
         let ret: Result<File, File> = nix().safely(
             Operation::Instantiate,
             passing_eval_path().as_path(),
@@ -693,23 +693,4 @@ mod tests {
             ],
         );
     }
-
-    #[test]
-    fn instantiation_nixpkgs_restricted_mode() {
-        let ret: Result<File, File> = nix().safely(
-            Operation::Instantiate,
-            individual_eval_path().as_path(),
-            vec![String::from("-A"), String::from("nixpkgs-restricted-mode")],
-            true,
-        );
-
-        assert_run(
-            ret,
-            Expect::Fail,
-            vec![
-                "access to path '/fake'",
-                "is forbidden in restricted mode",
-            ],
-        );
-    }
 }
diff --git a/ofborg/src/tasks/massrebuilder.rs b/ofborg/src/tasks/massrebuilder.rs
@@ -348,9 +348,6 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
                 "nixos-options",
                 nix::Operation::Instantiate,
                 vec![
-                    String::from("--arg"),
-                    String::from("nixpkgs"),
-                    String::from("./."),
                     String::from("./nixos/release.nix"),
                     String::from("-A"),
                     String::from("options"),
@@ -362,9 +359,6 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
                 "nixos-manual",
                 nix::Operation::Instantiate,
                 vec![
-                    String::from("--arg"),
-                    String::from("nixpkgs"),
-                    String::from("./."),
                     String::from("./nixos/release.nix"),
                     String::from("-A"),
                     String::from("manual"),
@@ -376,9 +370,6 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
                 "nixpkgs-manual",
                 nix::Operation::Instantiate,
                 vec![
-                    String::from("--arg"),
-                    String::from("nixpkgs"),
-                    String::from("./."),
                     String::from("./pkgs/top-level/release.nix"),
                     String::from("-A"),
                     String::from("manual"),
@@ -390,9 +381,6 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
                 "nixpkgs-tarball",
                 nix::Operation::Instantiate,
                 vec![
-                    String::from("--arg"),
-                    String::from("nixpkgs"),
-                    String::from("./."),
                     String::from("./pkgs/top-level/release.nix"),
                     String::from("-A"),
                     String::from("tarball"),
@@ -404,9 +392,6 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
                 "nixpkgs-unstable-jobset",
                 nix::Operation::Instantiate,
                 vec![
-                    String::from("--arg"),
-                    String::from("nixpkgs"),
-                    String::from("./."),
                     String::from("./pkgs/top-level/release.nix"),
                     String::from("-A"),
                     String::from("unstable"),
diff --git a/ofborg/test-srcs/eval-mixed-failure/default.nix b/ofborg/test-srcs/eval-mixed-failure/default.nix
@@ -1,14 +1,6 @@
 let
-  fetchGit = builtins.fetchGit or (path: assert builtins.trace ''
-    error: access to path '/fake' is forbidden in restricted mode
-  '' false; path);
-
   nix = import <nix/config.nix>;
-in
-
-{ nixpkgs ? fetchGit /fake }:
-
-rec {
+in rec {
   success = derivation {
     name = "success";
     system = builtins.currentSystem;
@@ -36,15 +28,6 @@ rec {
       "echo this ones cool" ];
   };
 
-  nixpkgs-restricted-mode = derivation {
-    name = "nixpkgs-restricted-mode-fetchgit";
-    system = builtins.currentSystem;
-    builder = nix.shell;
-    args = [
-      "-c"
-      "echo hi; echo ${toString nixpkgs} > $out" ];
-  };
-
   fails-instantiation = assert builtins.trace ''
     You just can't frooble the frozz on this particular system.
   '' false; {};
