ehmry
/
nix-processmgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix supervisor package reference

This commit is contained in:
Sander van der Burg 2022-05-31 18:43:34 +02:00
parent 84bca56fa2
commit 78ba5f6b1f
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/services-agnostic/constructors/constructors.nix
View File

@ -28,13 +28,13 @@ in
supervisord = import ./supervisord { supervisord = import ./supervisord {
inherit createManagedProcess runtimeDir logDir; inherit createManagedProcess runtimeDir logDir;
inherit (pkgs.pythonPackages) supervisor; inherit (pkgs.python3Packages) supervisor;
}; };
extendableSupervisord = import ./supervisord/extendable.nix { extendableSupervisord = import ./supervisord/extendable.nix {
inherit createManagedProcess libDir runtimeDir logDir; inherit createManagedProcess libDir runtimeDir logDir;
inherit (pkgs) writeTextFile; inherit (pkgs) writeTextFile;
inherit (pkgs.pythonPackages) supervisor; inherit (pkgs.python3Packages) supervisor;
}; };
docker = import ./docker { docker = import ./docker {

4
examples/webapps-agnostic/network-logical.nix
View File

@ -17,7 +17,7 @@ in
services.disnix.enable = true; services.disnix.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
networking.firewall.enable = false; networking.firewall.enable = false;
environment.systemPackages = [ pkgs.pythonPackages.supervisor nixproc-generate-config ]; environment.systemPackages = [ pkgs.python3Packages.supervisor nixproc-generate-config ];
}; };
test2 = {pkgs, ...}: test2 = {pkgs, ...}:
@ -36,6 +36,6 @@ in
services.disnix.enable = true; services.disnix.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
networking.firewall.enable = false; networking.firewall.enable = false;
environment.systemPackages = [ pkgs.pythonPackages.supervisor nixproc-generate-config ]; environment.systemPackages = [ pkgs.python3Packages.supervisor nixproc-generate-config ];
}; };
} }

4
nixproc/backends/supervisord/image-steps/supervisord.nix
View File

@ -1,8 +1,8 @@
{pkgs, common, input, result}: {pkgs, common, input, result}:
result // { result // {
contents = result.contents or [] ++ [ pkgs.pythonPackages.supervisor ]; contents = result.contents or [] ++ [ pkgs.python3Packages.supervisor ];
config = result.config or {} // { config = result.config or {} // {
Cmd = [ "${pkgs.pythonPackages.supervisor}/bin/supervisord" "--nodaemon" "--configuration" "/etc/supervisor/supervisord.conf" "--logfile" "/var/log/supervisord.log" "--pidfile" "/var/run/supervisord.pid" ]; Cmd = [ "${pkgs.python3Packages.supervisor}/bin/supervisord" "--nodaemon" "--configuration" "/etc/supervisor/supervisord.conf" "--logfile" "/var/log/supervisord.log" "--pidfile" "/var/run/supervisord.pid" ];
}; };
} }

2
nixproc/backends/supervisord/test-module/default.nix
View File

@ -22,7 +22,7 @@ in
systemPackages = [ systemPackages = [
tools.sysvinit tools.sysvinit
tools.supervisord tools.supervisord
pkgs.pythonPackages.supervisor pkgs.python3Packages.supervisor
]; ];
additionalPaths = [ processesEnvProcessManager processesEnvSystem ]; additionalPaths = [ processesEnvProcessManager processesEnvSystem ];

2
nixproc/create-managed-process/universal/create-managed-process-universal.nix
View File

@ -41,7 +41,7 @@ let
createSupervisordProgram = import ../../backends/supervisord/create-supervisord-program.nix { createSupervisordProgram = import ../../backends/supervisord/create-supervisord-program.nix {
inherit (pkgs) writeTextFile stdenv lib; inherit (pkgs) writeTextFile stdenv lib;
inherit (pkgs.pythonPackages) supervisor; inherit (pkgs.python3Packages) supervisor;
inherit createCredentials basePackages forceDisableUserChange runtimeDir; inherit createCredentials basePackages forceDisableUserChange runtimeDir;
}; };

2
tests/services/supervisord/default.nix
View File

@ -27,7 +27,7 @@ let
in in
testService { testService {
exprFile = ./processes.nix; exprFile = ./processes.nix;
systemPackages = [ pkgs.pythonPackages.supervisor ]; systemPackages = [ pkgs.python3Packages.supervisor ];
readiness = {instanceName, instance, ...}: readiness = {instanceName, instance, ...}:
'' ''

2
tests/webapps-agnostic-supervisord-stateless.nix
View File

@ -32,7 +32,7 @@ makeTest {
environment.systemPackages = [ environment.systemPackages = [
pkgs.stdenv pkgs.stdenv
pkgs.daemon pkgs.daemon
pkgs.pythonPackages.supervisor pkgs.python3Packages.supervisor
pkgs.dysnomia pkgs.dysnomia
tools.common tools.common
tools.systemd tools.systemd

2
tests/webapps-agnostic-supervisord.nix
View File

@ -73,7 +73,7 @@ makeTest {
environment.systemPackages = [ environment.systemPackages = [
pkgs.stdenv pkgs.stdenv
pkgs.pythonPackages.supervisor pkgs.python3Packages.supervisor
pkgs.dysnomia pkgs.dysnomia
tools.common tools.common
tools.systemd tools.systemd