commit d3e2957c90ee172f53f7ad34c4da1c6380c8f4c8 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/octoprint.nix

···

       117
       117
        
             '';

     

       118
       118
        
       

     

       119
       119
        
             serviceConfig = {

     

       120
       120
       -
               ExecStart = "${pkgs.octoprint}/bin/octoprint -b ${cfg.stateDir}";

     

       120
       120
       +
               ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}";

     

       121
       121
        
               User = cfg.user;

     

       122
       122
        
               Group = cfg.group;

     

       123
       123
        
               PermissionsStartOnly = true;

+53 -54

pkgs/applications/misc/octoprint/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, pythonPackages, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, python2, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
       

     

       5
       5
       -
         tornado_4_0_2 = pythonPackages.buildPythonPackage rec {

     

       6
       6
       -
           name = "tornado-${version}";

     

       7
       7
       -
           version = "4.0.2";

     

       5
       5
       +
         pythonPackages = python2.pkgs.override {

     

       6
       6
       +
           overrides = self: super: with self; {

     

       7
       7
       +
             backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2;

     

       8
       8
        
       

     

       9
       9
       -
           propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ];

     

       9
       9
       +
             tornado = buildPythonPackage rec {

     

       10
       10
       +
               name = "tornado-${version}";

     

       11
       11
       +
               version = "4.0.2";

     

       10
       12
        
       

     

       11
       11
       -
           src = fetchurl {

     

       12
       12
       -
             url = "mirror://pypi/t/tornado/${name}.tar.gz";

     

       13
       13
       -
             sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";

     

       14
       14
       -
           };

     

       15
       15
       -
         };

     

       13
       13
       +
               propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];

     

       16
       14
        
       

     

       17
       17
       -
         sockjs-tornado = pythonPackages.buildPythonPackage rec {

     

       18
       18
       -
           name = "sockjs-tornado-${version}";

     

       19
       19
       -
           version = "1.0.3";

     

       15
       15
       +
               src = fetchurl {

     

       16
       16
       +
                 url = "mirror://pypi/t/tornado/${name}.tar.gz";

     

       17
       17
       +
                 sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";

     

       18
       18
       +
               };

     

       19
       19
       +
             };

     

       20
       20
        
       

     

       21
       21
       -
           src = fetchurl {

     

       22
       22
       -
             url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";

     

       23
       23
       -
             sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";

     

       24
       24
       -
           };

     

       21
       21
       +
             flask_login = buildPythonPackage rec {

     

       22
       22
       +
               name = "Flask-Login-${version}";

     

       23
       23
       +
               version = "0.2.2";

     

       25
       24
        
       

     

       26
       26
       -
           # This is needed for compatibility with OctoPrint

     

       27
       27
       -
           propagatedBuildInputs = [ tornado_4_0_2 ];

     

       28
       28
       -
         };

     

       25
       25
       +
               src = fetchurl {

     

       26
       26
       +
                 url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";

     

       27
       27
       +
                 sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";

     

       28
       28
       +
               };

     

       29
       29
       +
       

     

       30
       30
       +
               propagatedBuildInputs = [ flask ];

     

       31
       31
       +
               buildInputs = [ nose ];

     

       29
       32
        
       

     

       30
       30
       -
         websocket_client = pythonPackages.buildPythonPackage rec {

     

       31
       31
       -
           name = "websocket_client-0.32.0";

     

       33
       33
       +
               # No tests included

     

       34
       34
       +
               doCheck = false;

     

       35
       35
       +
             };

     

       32
       36
        
       

     

       33
       33
       -
           src = fetchurl {

     

       34
       34
       -
             url = "mirror://pypi/w/websocket-client/${name}.tar.gz";

     

       35
       35
       -
             sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040";

     

       36
       36
       -
           };

     

       37
       37
       +
             jinja2 = buildPythonPackage rec {

     

       38
       38
       +
               pname = "Jinja2";

     

       39
       39
       +
               version = "2.8.1";

     

       40
       40
       +
               name = "${pname}-${version}";

     

       37
       41
        
       

     

       38
       38
       -
           propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];

     

       39
       39
       -
         };

     

       42
       42
       +
               src = fetchurl {

     

       43
       43
       +
                 url = "mirror://pypi/J/Jinja2/${name}.tar.gz";

     

       44
       44
       +
                 sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";

     

       45
       45
       +
               };

     

       40
       46
        
       

     

       41
       41
       -
         flask_login = pythonPackages.buildPythonPackage rec {

     

       42
       42
       -
           name = "Flask-Login-${version}";

     

       43
       43
       -
           version = "0.2.2";

     

       47
       47
       +
               propagatedBuildInputs = [ markupsafe ];

     

       44
       48
        
       

     

       45
       45
       -
           src = fetchurl {

     

       46
       46
       -
             url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";

     

       47
       47
       -
             sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";

     

       49
       49
       +
               # No tests included

     

       50
       50
       +
               doCheck = false;

     

       51
       51
       +
             };

     

       48
       52
        
           };

     

       49
       49
       -
       

     

       50
       50
       -
           propagatedBuildInputs = with pythonPackages; [ flask ];

     

       51
       51
       -
       

     

       52
       52
       -
           # FIXME

     

       53
       53
       -
           doCheck = false;

     

       54
       53
        
         };

     

       55
       54
        
       

     

       56
       55
        
       in pythonPackages.buildPythonApplication rec {

     

       57
       56
        
         name = "OctoPrint-${version}";

     

       58
       58
       -
         version = "1.3.1";

     

       57
       57
       +
         version = "1.3.2";

     

       59
       58
        
       

     

       60
       59
        
         src = fetchFromGitHub {

     

       61
       60
        
           owner = "foosel";

     

       62
       61
        
           repo = "OctoPrint";

     

       63
       62
        
           rev = version;

     

       64
       64
       -
           sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9";

     

       63
       63
       +
           sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk";

     

       65
       64
        
         };

     

       66
       65
        
       

     

       67
       66
        
         # We need old Tornado

     

       68
       67
        
         propagatedBuildInputs = with pythonPackages; [

     

       69
       68
        
           awesome-slugify flask_assets rsa requests2 pkginfo watchdog

     

       70
       70
       -
           semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2

     

       69
       69
       +
           semantic-version flask_principal werkzeug flaskbabel tornado

     

       71
       70
        
           psutil pyserial flask_login netaddr markdown sockjs-tornado

     

       72
       71
        
           pylru pyyaml sarge feedparser netifaces click websocket_client

     

       73
       72
        
           scandir chainmap future

     

       74
       73
        
         ];

     

       74
       74
       +
       

     

       75
       75
       +
         buildInputs = with pythonPackages; [ nose mock ddt ];

     

       75
       76
        
       

     

       76
       77
        
         # Jailbreak dependencies.

     

       77
       77
       -
         # Currently broken for new: tornado, pyserial, flask_login

     

       78
       78
        
         postPatch = ''

     

       79
       79
        
           sed -i \

     

       80
       80
       -
             -e 's,werkzeug>=[^"]*,werkzeug,g' \

     

       81
       81
       -
             -e 's,requests>=[^"]*,requests,g' \

     

       82
       80
        
             -e 's,pkginfo>=[^"]*,pkginfo,g' \

     

       83
       83
       -
             -e 's,semantic_version>=[^"]*,semantic_version,g' \

     

       84
       84
       -
             -e 's,psutil>=[^"]*,psutil,g' \

     

       85
       85
       -
             -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \

     

       86
       81
        
             -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \

     

       87
       87
       -
             -e 's,markdown>=[^"]*,markdown,g' \

     

       88
       88
       -
             -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \

     

       82
       82
       +
             -e 's,websocket-client>=[^"]*,websocket-client,g' \

     

       83
       83
       +
             -e 's,Click>=[^"]*,Click,g' \

     

       89
       84
        
             -e 's,rsa>=[^"]*,rsa,g' \

     

       85
       85
       +
             -e 's,flask>=[^"]*,flask,g' \

     

       86
       86
       +
             -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \

     

       87
       87
       +
             -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \

     

       90
       88
        
             -e 's,PyYAML>=[^"]*,PyYAML,g' \

     

       91
       91
       -
             -e 's,flask>=[^"]*,flask,g' \

     

       92
       92
       -
             -e 's,Click>=[^"]*,Click,g' \

     

       93
       93
       -
             -e 's,websocket-client>=[^"]*,websocket-client,g' \

     

       94
       89
        
             -e 's,scandir>=[^"]*,scandir,g' \

     

       95
       95
       -
             -e 's,Jinja2>=[^"]*,Jinja2,g' \

     

       90
       90
       +
             -e 's,werkzeug>=[^"]*,werkzeug,g' \

     

       91
       91
       +
             -e 's,psutil>=[^"]*,psutil,g' \

     

       92
       92
       +
             -e 's,requests>=[^"]*,requests,g' \

     

       96
       93
        
             setup.py

     

       97
       94
        
         '';

     

       95
       95
       +
       

     

       96
       96
       +
         checkPhase = "nosetests";

     

       98
       97
        
       

     

       99
       98
        
         meta = with stdenv.lib; {

     

       100
       99
        
           homepage = "http://octoprint.org/";