summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-02-14 14:13:39 -0500
committerGraham Christensen <graham@grahamc.com>2017-02-14 14:13:39 -0500
commit7483ba093222371e33d5daa22269992104f401c6 (patch)
tree8d358c9fb72f3dba19596db489d1ed5ae210f4e3 /nixos
parent1ab91b2cea031f732596778819f7a8d8a1d6c86d (diff)
downloadnixlib-7483ba093222371e33d5daa22269992104f401c6.tar
nixlib-7483ba093222371e33d5daa22269992104f401c6.tar.gz
nixlib-7483ba093222371e33d5daa22269992104f401c6.tar.bz2
nixlib-7483ba093222371e33d5daa22269992104f401c6.tar.lz
nixlib-7483ba093222371e33d5daa22269992104f401c6.tar.xz
nixlib-7483ba093222371e33d5daa22269992104f401c6.tar.zst
nixlib-7483ba093222371e33d5daa22269992104f401c6.zip
Revert "nix-daemon: default useSandbox to true"
This reverts commit d0a086770a1be8c1f3175c195587052c5a5bfe1c.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-1703.xml4
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix8
2 files changed, 4 insertions, 8 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 68dc8e9b4bfc..8f9694bad8bd 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -30,10 +30,6 @@ has the following highlights: </para>
   <listitem>
     <para>PHP now defaults to PHP 7.1</para>
   </listitem>
-
-  <listitem>
-    <para>nix-daemon now uses sandboxing by default.</para>
-  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4c7264f4ac83..7101cadfeed2 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -100,14 +100,14 @@ in
 
       useSandbox = mkOption {
         type = types.either types.bool (types.enum ["relaxed"]);
-        default = true;
+        default = false;
         description = "
           If set, Nix will perform builds in a sandboxed environment that it
           will set up automatically for each build.  This prevents
           impurities in builds by disallowing access to dependencies
-          outside of the Nix store. It doesn't affect derivation
-          hashes, so changing this option will not trigger a rebuild
-          of packages.
+          outside of the Nix store. This isn't enabled by default for
+          performance. It doesn't affect derivation hashes, so changing
+          this option will not trigger a rebuild of packages.
         ";
       };