diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-05 23:18:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 23:18:27 +0000 |
| commit | 5fe1be88a53e7213e946600c08b2a9ba793ff921 (patch) | |
| tree | 5ba558eb2d1f719fb131a26450709c5b44944616 | |
| parent | 7aad357cadba39d069dc2a306d19ffdb955d0470 (diff) | |
| parent | 30877b1ed855f77b4a5da3184dbb83276c3649c0 (diff) | |
| download | nixlib-5fe1be88a53e7213e946600c08b2a9ba793ff921.tar nixlib-5fe1be88a53e7213e946600c08b2a9ba793ff921.tar.gz nixlib-5fe1be88a53e7213e946600c08b2a9ba793ff921.tar.bz2 nixlib-5fe1be88a53e7213e946600c08b2a9ba793ff921.tar.lz nixlib-5fe1be88a53e7213e946600c08b2a9ba793ff921.tar.xz nixlib-5fe1be88a53e7213e946600c08b2a9ba793ff921.tar.zst nixlib-5fe1be88a53e7213e946600c08b2a9ba793ff921.zip | |
Merge pull request #36350 from volth/nix-serve
nix-serve: nix 2.0 fixes
| -rw-r--r-- | nixos/modules/services/networking/nix-serve.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix-serve/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 3e865e3b76a8..8499e7c0f7c4 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -55,6 +55,8 @@ in environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; serviceConfig = { + Restart = "always"; + RestartSec = "5s"; ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + "--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; User = "nix-serve"; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 1e3579b197e9..dadcab1ea4f5 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit rev sha256; }; - buildInputs = [ bzip2 perl nix ] + buildInputs = [ bzip2 perl nix nix.perl-bindings ] ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]); dontBuild = true; |