From 906d56a96b442d4dd8f924c1ce0d1eec0e214af3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 11 Oct 2019 18:48:59 +0200
Subject: ssh-ng: Don't set CPU affinity on the remote

Fixes #3138.
---
 src/libstore/remote-store.cc | 2 +-
 src/libstore/remote-store.hh | 5 +++++
 src/libstore/ssh-store.cc    | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index b7f202a6b..f34369d8f 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -151,7 +151,7 @@ void RemoteStore::initConnection(Connection & conn)
         conn.to << PROTOCOL_VERSION;
 
         if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 14) {
-            int cpu = settings.lockCPU ? lockToCurrentCPU() : -1;
+            int cpu = sameMachine() && settings.lockCPU ? lockToCurrentCPU() : -1;
             if (cpu != -1)
                 conn.to << 1 << cpu;
             else
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 82fbec092..1f375dd71 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -29,6 +29,8 @@ public:
     const Setting<unsigned int> maxConnectionAge{(Store*) this, std::numeric_limits<unsigned int>::max(),
             "max-connection-age", "number of seconds to reuse a connection"};
 
+    virtual bool sameMachine() = 0;
+
     RemoteStore(const Params & params);
 
     /* Implementations of abstract store API methods. */
@@ -146,6 +148,9 @@ public:
 
     std::string getUri() override;
 
+    bool sameMachine()
+    { return true; }
+
 private:
 
     ref<RemoteStore::Connection> openConnection() override;
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 39205ae2c..93e117389 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -35,6 +35,9 @@ public:
         return uriScheme + host;
     }
 
+    bool sameMachine()
+    { return false; }
+
     void narFromPath(const Path & path, Sink & sink) override;
 
     ref<FSAccessor> getFSAccessor() override;
-- 
cgit v1.2.3


From 389a2cebed7cd72bda524ece0a56af2888cd80b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Oct 2019 13:14:39 +0200
Subject: SourceExprCommand::getSourceExpr(): Allocate more space

Fixes #3140.
---
 src/nix/installables.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index 52f9778fc..0e8bba39d 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -39,7 +39,7 @@ Value * SourceExprCommand::getSourceExpr(EvalState & state)
 
         auto searchPath = state.getSearchPath();
 
-        state.mkAttrs(*vSourceExpr, searchPath.size() + 1);
+        state.mkAttrs(*vSourceExpr, 1024);
 
         mkBool(*state.allocAttr(*vSourceExpr, sToplevel), true);
 
-- 
cgit v1.2.3


From aabf5c86c9df1b4e1616a4cf06ee14a6edf2e5e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 16 Oct 2019 17:45:09 +0200
Subject: Add experimental-features setting

Experimental features are now opt-in. There is currently one
experimental feature: "nix-command" (which enables the "nix"
command. This will allow us to merge experimental features more
quickly, without committing to supporting them indefinitely.

Typical usage:

$ nix build --experimental-features 'nix-command flakes' nixpkgs#hello

(cherry picked from commit 8e478c234100cf03ea1b777d4bd42a9be7be9e8c,
without the "flakes" feature)
---
 src/libstore/globals.cc | 7 +++++++
 src/libstore/globals.hh | 5 +++++
 src/nix/main.cc         | 2 ++
 3 files changed, 14 insertions(+)

(limited to 'src')

diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 1c2c08715..249c36673 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -105,6 +105,13 @@ StringSet Settings::getDefaultSystemFeatures()
     return features;
 }
 
+void Settings::requireExperimentalFeature(const std::string & name)
+{
+    auto & f = experimentalFeatures.get();
+    if (std::find(f.begin(), f.end(), name) == f.end())
+        throw Error("experimental Nix feature '%s' is disabled", name);
+}
+
 const string nixVersion = PACKAGE_VERSION;
 
 template<> void BaseSetting<SandboxMode>::set(const std::string & str)
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index ab1c09aa2..1221e4db7 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -353,6 +353,11 @@ public:
 
     Setting<Paths> pluginFiles{this, {}, "plugin-files",
         "Plugins to dynamically load at nix initialization time."};
+
+    Setting<Strings> experimentalFeatures{this, {}, "experimental-features",
+        "Experimental Nix features to enable."};
+
+    void requireExperimentalFeature(const std::string & name);
 };
 
 
diff --git a/src/nix/main.cc b/src/nix/main.cc
index a80fd0ea6..22f5e8c4c 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -138,6 +138,8 @@ void mainWrapped(int argc, char * * argv)
 
     args.parseCmdline(argvToStrings(argc, argv));
 
+    settings.requireExperimentalFeature("nix-command");
+
     initPlugins();
 
     if (!args.command) args.showHelpAndExit();
-- 
cgit v1.2.3