···

       
54
       
54
       
 
       
  };

     

       
55
       
55
       
 
       
  config = mkIf cfg.enable {

     

       
56
       
56
       
 
       
    environment.systemPackages = with pkgs.pythonPackages; [

     

       
57
       
57
       
-
       
      python twisted pycrypto pyasn1 ];

     

       
57
       
57
       
+
       
      python twisted_11 pycrypto pyasn1 ];

     

       
58
       
58
       
 
       


     

       
59
       
59
       
 
       
    environment.etc."kippo.cfg".text = ''

     

       
60
       
60
       
 
       
        # Automatically generated by NixOS.

     
···

       
84
       
84
       
 
       
      description = "Kippo Web Server";

     

       
85
       
85
       
 
       
      after = [ "network.target" ];

     

       
86
       
86
       
 
       
      wantedBy = [ "multi-user.target" ];

     

       
87
       
87
       
-
       
      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/:.";

     

       
87
       
87
       
+
       
      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/:.";

     

       
88
       
88
       
 
       
      preStart = ''

     

       
89
       
89
       
 
       
        if [ ! -d ${cfg.varPath}/ ] ; then

     

       
90
       
90
       
 
       
            mkdir -p ${cfg.logPath}/tty

     
···

       
107
       
107
       
 
       
        fi

     

       
108
       
108
       
 
       
      '';

     

       
109
       
109
       
 
       


     

       
110
       
110
       
-
       
      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";

     

       
110
       
110
       
+
       
      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";

     

       
111
       
111
       
 
       
      serviceConfig.PermissionsStartOnly = true;

     

       
112
       
112
       
 
       
      serviceConfig.User = "kippo"; 

     

       
113
       
113
       
 
       
      serviceConfig.Group = "kippo"; 

     

···

       
34
       
34
       
 
       
      url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz";

     

       
35
       
35
       
 
       
      sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6";

     

       
36
       
36
       
 
       
    };

     

       
37
       
37
       
-
       
    buildInputs = with pkgs.pythonPackages; [ pycrypto pyasn1 twisted ];

     

       
37
       
37
       
+
       
    buildInputs = with pkgs.pythonPackages; [ pycrypto pyasn1 twisted_11 ];

     

       
38
       
38
       
 
       
    installPhase = ''

     

       
39
       
39
       
 
       
        substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg"

     

       
40
       
40
       
 
       
        substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \