diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-06 12:59:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-06 12:59:05 +0200 |
| commit | 6f836eb0d4df58bf2823c969a80909ec2aef89bf (patch) | |
| tree | 5e7d98675b8e249fdb8bf547bee9d09f02f9588b /nixos | |
| parent | 2fdda9ce0436d0f01e036f1e54ead722d2a5dfa0 (diff) | |
| download | nixpkgs-6f836eb0d4df58bf2823c969a80909ec2aef89bf.tar nixpkgs-6f836eb0d4df58bf2823c969a80909ec2aef89bf.tar.gz nixpkgs-6f836eb0d4df58bf2823c969a80909ec2aef89bf.tar.bz2 nixpkgs-6f836eb0d4df58bf2823c969a80909ec2aef89bf.tar.lz nixpkgs-6f836eb0d4df58bf2823c969a80909ec2aef89bf.tar.xz nixpkgs-6f836eb0d4df58bf2823c969a80909ec2aef89bf.tar.zst nixpkgs-6f836eb0d4df58bf2823c969a80909ec2aef89bf.zip | |
Kippo: move pythonPackages.twisted_11 to kippo expression
Diffstat (limited to 'nixos')
| -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 5f3efcd133a..e3defd262f9 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_11 pycrypto pyasn1 ]; + python pkgs.kippo.twisted 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_11}/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.kippo.twisted}/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_11}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; + serviceConfig.ExecStart = "${pkgs.kippo.twisted/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"; |