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

Merge pull request #1229 from helsinki-systems/fix/nix-cat-store

Browse source 
replace nix cat-store with nix store cat
This commit is contained in:
Janne Heß 2022-07-01 13:28:27 +02:00 committed by GitHub
parent f2f82b3eee bab671124d
commit e05118171b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -234,7 +234,7 @@ sub serveFile {
elsif ($ls->{type} eq "regular") { elsif ($ls->{type} eq "regular") {
$c->stash->{'plain'} = { data => grab(cmd => ["nix", "--experimental-features", "nix-command", $c->stash->{'plain'} = { data => grab(cmd => ["nix", "--experimental-features", "nix-command",
"cat-store", "--store", getStoreUri(), "$path"]) }; "store", "cat", "--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";
@ -366,7 +366,7 @@ sub contents : Chained('buildChain') PathPart Args(1) {
# FIXME: don't use shell invocations below. # FIXME: don't use shell invocations below.
# FIXME: use nix cat-store # FIXME: use nix store cat
my $res; my $res;

2
src/lib/Hydra/Helper/Nix.pm
View file

@ -537,7 +537,7 @@ sub getStoreUri {
sub readNixFile { sub readNixFile {
my ($path) = @_; my ($path) = @_;
return grab(cmd => ["nix", "--experimental-features", "nix-command", return grab(cmd => ["nix", "--experimental-features", "nix-command",
"cat-store", "--store", getStoreUri(), "$path"]); "store", "cat", "--store", getStoreUri(), "$path"]);
} }