ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

treewide: allow nix command

Browse source
This commit is contained in:
Graham Christensen 2020-03-03 22:46:32 -05:00
parent 117b9ecef1
commit 994430b94b
No known key found for this signature in database
GPG key ID: FE918C3A98C1030F
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/Hydra/Controller/Build.pm
View file

@ -193,7 +193,8 @@ sub checkPath {
sub serveFile { sub serveFile {
my ($c, $path) = @_; my ($c, $path) = @_;
my $res = run(cmd => ["nix", "ls-store", "--store", getStoreUri(), "--json", "$path"]); my $res = run(cmd => ["nix", "--experimental-features", "nix-command",
"ls-store", "--store", getStoreUri(), "--json", "$path"]);
if ($res->{status}) { if ($res->{status}) {
notFound($c, "File '$path' does not exist.") if $res->{stderr} =~ /does not exist/; notFound($c, "File '$path' does not exist.") if $res->{stderr} =~ /does not exist/;
@ -217,7 +218,8 @@ sub serveFile {
elsif ($ls->{type} eq "regular") { elsif ($ls->{type} eq "regular") {
$c->stash->{'plain'} = { data => grab(cmd => ["nix", "cat-store", "--store", getStoreUri(), "$path"]) }; $c->stash->{'plain'} = { data => grab(cmd => ["nix", "--experimental-features", "nix-command",
"cat-store", "--store", getStoreUri(), "$path"]) };
# Detect MIME type. Borrowed from Catalyst::Plugin::Static::Simple. # Detect MIME type. Borrowed from Catalyst::Plugin::Static::Simple.
my $type = "text/plain"; my $type = "text/plain";

2
src/script/hydra-eval-jobset
View file

@ -82,7 +82,7 @@ sub getPath {
my $substituter = $config->{eval_substituter}; my $substituter = $config->{eval_substituter};
system("nix", "copy", "--from", $substituter, "--", $path) system("nix", "--experimental-features", "nix-command", "copy", "--from", $substituter, "--", $path)
if defined $substituter; if defined $substituter;
return isValidPath($path); return isValidPath($path);