diff options
| author | Pascal Wittmann <PascalWittmann@gmx.net> | 2016-02-22 23:50:17 +0100 |
|---|---|---|
| committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2016-02-22 23:50:17 +0100 |
| commit | 5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b (patch) | |
| tree | 4074bf9634c703bfe0e930ea9f939beb34a08e9b /nixos/modules/services/networking | |
| parent | fbca8ede650cd7612580f463c153ac9db64dacc4 (diff) | |
| parent | e31c8922e00165f00bc148c14a4f5c260f50789e (diff) | |
| download | nixlib-5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b.tar nixlib-5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b.tar.gz nixlib-5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b.tar.bz2 nixlib-5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b.tar.lz nixlib-5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b.tar.xz nixlib-5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b.tar.zst nixlib-5d6d841d58890f94ed740daaf0a6dd9d2c7ccb2b.zip | |
Merge pull request #13373 from tomberek/revert_kippo_twisted
kippo: revert twisted dependency
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/kippo.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 7d70a3d05fa7..5f3efcd133a1 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -54,7 +54,7 @@ rec { }; config = mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ - python twisted pycrypto pyasn1 ]; + python twisted_11 pycrypto pyasn1 ]; environment.etc."kippo.cfg".text = '' # Automatically generated by NixOS. @@ -84,7 +84,7 @@ rec { description = "Kippo Web Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted}/lib/python2.7/site-packages/:."; + environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted_11}/lib/python2.7/site-packages/:."; preStart = '' if [ ! -d ${cfg.varPath}/ ] ; then mkdir -p ${cfg.logPath}/tty @@ -107,7 +107,7 @@ rec { fi ''; - serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; + serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted_11}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; serviceConfig.PermissionsStartOnly = true; serviceConfig.User = "kippo"; serviceConfig.Group = "kippo"; |