JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36350 from volth/nix-serve

Browse Source 
nix-serve: nix 2.0 fixes
This commit is contained in:
Jörg Thalheim 2018-03-05 23:18:27 +00:00 committed by GitHub
commit 5fe1be88a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/nix-serve.nix
View File

@ -55,6 +55,8 @@ in
environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
serviceConfig = { serviceConfig = {
Restart = "always";
RestartSec = "5s";
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
"--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; "--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
User = "nix-serve"; User = "nix-serve";

2
pkgs/tools/package-management/nix-serve/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit rev sha256; inherit rev sha256;
}; };
buildInputs = [ bzip2 perl nix ] buildInputs = [ bzip2 perl nix nix.perl-bindings ]
++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]); ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
dontBuild = true; dontBuild = true;