octoprint: 1.12.10 -> 1.12.15

1 files changed, 19 insertions, 16 deletions

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