From cb5e438a08cb44c49bd583a7478a6a2db1a04ea9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 9 Nov 2016 19:15:13 +0100
Subject: [PATCH] Bump Nix

Fixes #398.
---
 release.nix                                  | 4 ++--
 src/hydra-queue-runner/build-remote.cc       | 4 ++--
 src/hydra-queue-runner/hydra-queue-runner.cc | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/release.nix b/release.nix
index d77d642c..913247e3 100644
--- a/release.nix
+++ b/release.nix
@@ -58,8 +58,8 @@ rec {
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "d2c58ba60572e4248bd52f82fac57d6e0c79773d";
-          sha256 = "195f23xcndzrzg3n4wk0884qa6k4gm9mq1pkhzd7rn30vkn564dc";
+          rev = "2af5d35fdc1171a9bdab7e2fc005673d76417c06";
+          sha256 = "1q2s4r895qn6sws048j7xwfdpyxm0dwkh52c55535w7x46am33wa";
         };
         buildInputs = attrs.buildInputs ++ [ autoreconfHook bison flex ];
         nativeBuildInputs = attrs.nativeBuildInputs ++ [ aws-sdk-cpp' autoconf-archive ];
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index 6127a793..65452be3 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -220,7 +220,7 @@ void State::buildRemote(ref<Store> destStore,
            a no-op for regular stores, but for the binary cache store,
            this will copy the inputs to the binary cache from the local
            store. */
-        copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs);
+        copyClosure(ref<Store>(localStore), destStore, step->drv.inputSrcs, false, true);
 
         /* Copy the input closure. */
         if (/* machine->sshName != "localhost" */ true) {
@@ -388,7 +388,7 @@ void State::buildRemote(ref<Store> destStore,
 
             to << cmdExportPaths << 0 << outputs;
             to.flush();
-            destStore->importPaths(from, result.accessor);
+            destStore->importPaths(from, result.accessor, true);
 
             auto now2 = std::chrono::steady_clock::now();
 
diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc
index 7e602a54..8a748d5a 100644
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -799,11 +799,9 @@ void State::run(BuildID buildOne)
 
     localStore = openStore();
 
-    if (hydraConfig["store_uri"] == "") {
-        _destStore = localStore;
-    } else {
-        _destStore = openStoreAt(hydraConfig["store_uri"]);
-    }
+    _destStore = hydraConfig["store_uri"] == ""
+        ? localStore
+        : openStore(hydraConfig["store_uri"]);
 
     auto isTrue = [](const std::string & s) {
         return s == "1" || s == "true";