octoprint: 1.12.10 -> 1.12.15

This commit is contained in:
Nikolay Amiantov 2016-08-13 03:02:34 +03:00
parent 8f62339911
commit 503eefa412

View File

@ -2,41 +2,44 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}"; name = "OctoPrint-${version}";
version = "1.2.10"; version = "1.2.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foosel"; owner = "foosel";
repo = "OctoPrint"; repo = "OctoPrint";
rev = version; rev = version;
sha256 = "1ips1083c4qrfnkssvp1lxrs92svlid29l225ifsymrinpbjawav"; sha256 = "0qfragp7n8m7l5l30s5fz1x7xzini2sdh2y3m1ahs7ay8zp4xk56";
}; };
# We need old Tornado # We need old Tornado
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
awesome-slugify flask_assets watchdog rsa requests2 pkginfo pylru awesome-slugify flask_assets rsa requests2 pkginfo watchdog
semantic-version flask_principal sarge tornado_4_0_1 werkzeug netaddr flaskbabel semantic-version flask_principal werkzeug flaskbabel tornado_4_0_1
netifaces psutil pyserial flask_login pyyaml sockjs-tornado psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces
]; ];
# Jailbreak dependencies.
# Currently broken for new: tornado, pyserial, flask_login
postPatch = '' postPatch = ''
# Jailbreak dependencies
sed -i \ sed -i \
-e 's,rsa==,rsa>=,g' \ -e 's,werkzeug>=[^"]*,werkzeug,g' \
-e 's,sockjs-tornado==,sockjs-tornado>=,g' \ -e 's,requests>=[^"]*,requests,g' \
-e 's,Flask-Principal==,Flask-Principal>=,g' \ -e 's,pkginfo>=[^"]*,pkginfo,g' \
-e 's,werkzeug==,werkzeug>=,g' \ -e 's,semantic_version>=[^"]*,semantic_version,g' \
-e 's,netaddr==,netaddr>=,g' \ -e 's,psutil>=[^"]*,psutil,g' \
-e 's,requests==,requests>=,g' \ -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
-e 's,netifaces==,netifaces>=,g' \ -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
-e 's,psutil==,psutil>=,g' \ -e 's,markdown>=[^"]*,markdown,g' \
-e 's,PyYAML==,PyYAML>=,g' \ -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
-e 's,rsa>=[^"]*,rsa,g' \
-e 's,PyYAML>=[^"]*,PyYAML,g' \
setup.py setup.py
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://octoprint.org/"; homepage = "http://octoprint.org/";
description = "The snappy web interface for your 3D printer"; description = "The snappy web interface for your 3D printer";
platforms = platforms.all;
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };