JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

octoprint: fix build

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-06-23 12:20:32 +02:00
parent 59daa4fd62
commit 14b28269b3
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/misc/octoprint/default.nix
View File

@ -6,29 +6,37 @@ let
overrides = self: super: with self; { overrides = self: super: with self; {
backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2; backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2;
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
version = "0.12.4";
src = oldAttrs.src.override {
inherit version;
sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd";
};
});
tornado = buildPythonPackage rec { tornado = buildPythonPackage rec {
name = "tornado-${version}"; pname = "tornado";
version = "4.0.2"; version = "4.0.2";
propagatedBuildInputs = [ backports_ssl_match_hostname certifi ]; propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];
src = fetchurl { src = fetchPypi {
url = "mirror://pypi/t/tornado/${name}.tar.gz"; inherit pname version;
sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
}; };
}; };
flask_login = buildPythonPackage rec { flask_login = buildPythonPackage rec {
name = "Flask-Login-${version}"; pname = "Flask-Login";
version = "0.2.2"; version = "0.2.2";
src = fetchurl { src = fetchPypi {
url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; inherit pname version;
sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
}; };
propagatedBuildInputs = [ flask ]; propagatedBuildInputs = [ flask ];
buildInputs = [ nose ]; checkInputs = [ nose ];
# No tests included # No tests included
doCheck = false; doCheck = false;
@ -37,10 +45,9 @@ let
jinja2 = buildPythonPackage rec { jinja2 = buildPythonPackage rec {
pname = "Jinja2"; pname = "Jinja2";
version = "2.8.1"; version = "2.8.1";
name = "${pname}-${version}";
src = fetchurl { src = fetchPypi {
url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; inherit pname version;
sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
}; };
@ -53,14 +60,14 @@ let
}; };
in pythonPackages.buildPythonApplication rec { in pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}"; pname = "OctoPrint";
version = "1.3.6"; version = "1.3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foosel"; owner = "foosel";
repo = "OctoPrint"; repo = "OctoPrint";
rev = version; rev = version;
sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3"; sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3";
}; };
# We need old Tornado # We need old Tornado
@ -70,9 +77,10 @@ in pythonPackages.buildPythonApplication rec {
psutil pyserial flask_login netaddr markdown sockjs-tornado psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client pylru pyyaml sarge feedparser netifaces click websocket_client
scandir chainmap future dateutil futures wrapt monotonic emoji scandir chainmap future dateutil futures wrapt monotonic emoji
frozendict
]; ];
buildInputs = with pythonPackages; [ nose mock ddt ]; checkInputs = with pythonPackages; [ nose mock ddt ];
# Jailbreak dependencies. # Jailbreak dependencies.
postPatch = '' postPatch = ''
@ -88,7 +96,7 @@ in pythonPackages.buildPythonApplication rec {
-e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,PyYAML>=[^"]*,PyYAML,g' \
-e 's,scandir>=[^"]*,scandir,g' \ -e 's,scandir>=[^"]*,scandir,g' \
-e 's,werkzeug>=[^"]*,werkzeug,g' \ -e 's,werkzeug>=[^"]*,werkzeug,g' \
-e 's,psutil>=[^"]*,psutil,g' \ -e 's,psutil==[^"]*,psutil,g' \
-e 's,requests>=[^"]*,requests,g' \ -e 's,requests>=[^"]*,requests,g' \
-e 's,future>=[^"]*,future,g' \ -e 's,future>=[^"]*,future,g' \
-e 's,pyserial>=[^"]*,pyserial,g' \ -e 's,pyserial>=[^"]*,pyserial,g' \