From a738f826e8dc9a88f7f0024670bd232e29d6e986 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 1 Apr 2017 10:38:39 -0400
Subject: [PATCH] declarative projects: Pull jobset spec build from the remote
 store

Fixes #443
---
 src/lib/Hydra/Helper/AddBuilds.pm |  2 +-
 src/lib/Hydra/Helper/Nix.pm       | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index 2bad203f..d608e085 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -68,7 +68,7 @@ sub handleDeclarativeJobsetBuild {
         my $id = $build->id;
         die "Declarative jobset build $id failed" unless $build->buildstatus == 0;
         my $declPath = ($build->buildoutputs)[0]->path;
-        my $declText = read_file($declPath)
+        my $declText = readNixFile($declPath)
             or die "Couldn't read declarative specification file $declPath: $!";
         my $declSpec = decode_json($declText);
         txn_do($db, sub {
diff --git a/src/lib/Hydra/Helper/Nix.pm b/src/lib/Hydra/Helper/Nix.pm
index 0edca601..7989e0cc 100644
--- a/src/lib/Hydra/Helper/Nix.pm
+++ b/src/lib/Hydra/Helper/Nix.pm
@@ -23,7 +23,7 @@ our @EXPORT = qw(
     getEvals getMachines
     pathIsInsidePrefix
     captureStdoutStderr run grab
-    getTotalShares
+    getTotalShares readNixFile
     cancelBuilds restartBuilds);
 
 
@@ -412,7 +412,18 @@ sub run {
         my @x = ($args{cmd}, \$stdin, \$res->{stdout});
         push @x, \$res->{stderr} if $args{grabStderr} // 1;
         IPC::Run::run(@x,
-            init => sub { chdir $args{dir} or die "changing to $args{dir}" if defined $args{dir}; });
+            init => sub {
+                chdir $args{dir} or die "changing to $args{dir}" if defined $args{dir};
+                if (defined $args{env}) {
+                    foreach my $key (keys %{$args{env}}) {
+                        if (defined $args{env}->{$key}) {
+                            $ENV{$key} = $args{env}->{$key};
+                        } else {
+                            delete $ENV{$key};
+                        }
+                    }
+                }
+            });
         alarm 0;
     };
 
@@ -501,4 +512,13 @@ sub restartBuilds($$) {
 }
 
 
+# Read a file from the (possibly remote) nix store
+sub readNixFile {
+    my ($path) = @_;
+    my $config = getHydraConfig();
+    my $storeUri = $config->{'store_uri'} // "";
+    return grab(cmd => ["nix", "cat-store", "$path"], env => { NIX_REMOTE => "$storeUri" });
+}
+
+
 1;