From 26c229376237e6c34f7311b5d89fa83ce23a2031 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 1 Nov 2019 18:48:17 +0100
Subject: [PATCH] curaPlugins.octoprint: patch merged upstream

---
 pkgs/applications/misc/cura/plugins.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index 3d94ff0dfc1..20c58ddfb1d 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -11,8 +11,8 @@ let
       src = fetchFromGitHub {
         owner = "fieldOfView";
         repo = pname;
-        rev = "0702f3a52887ea4ab6736c990bbe9628d677688e";
-        sha256 = "0cm4kciw3izqk51pfbznawk80k7n7pyvrlzd9ccjgdl994ljcqi5";
+        rev = "a82a42a87bbeb390b80b991afb1a6741c46a3432";
+        sha256 = "0q5yd7pw626qls2ks2y39hb9czd6lgh71jalzl2drwdi6a8mwsfz";
       };
 
       nativeBuildInputs = [ cmake ];
@@ -21,15 +21,6 @@ let
         netifaces
       ];
 
-      patches = [
-        # Fix incorrect paths in CMakeLists.txt
-        # https://github.com/fieldOfView/Cura-OctoPrintPlugin/pull/131
-        (fetchpatch {
-          url = "https://github.com/gebner/Cura-OctoPrintPlugin/commit/fce8c21b3a584559da7942cb239fbf6673153454.patch";
-          sha256 = "06d82jpqvcpz90svhhlk2g3pvxm3psfnd2j30m6cl9441qp5nvcp";
-        })
-      ];
-
       meta = with stdenv.lib; {
         description = "Enables printing directly to OctoPrint and monitoring the process";
         homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin";