diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-28 00:21:19 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-28 03:33:23 +0300 |
| commit | c766092193e44eda1a645080d737fda5c58fdd02 (patch) | |
| tree | eebfc7bb068f316e632bb58bb949a559d734798e | |
| parent | d0435ba032473f89fad8b6425bb3feee3d6fd718 (diff) | |
| download | nixlib-c766092193e44eda1a645080d737fda5c58fdd02.tar nixlib-c766092193e44eda1a645080d737fda5c58fdd02.tar.gz nixlib-c766092193e44eda1a645080d737fda5c58fdd02.tar.bz2 nixlib-c766092193e44eda1a645080d737fda5c58fdd02.tar.lz nixlib-c766092193e44eda1a645080d737fda5c58fdd02.tar.xz nixlib-c766092193e44eda1a645080d737fda5c58fdd02.tar.zst nixlib-c766092193e44eda1a645080d737fda5c58fdd02.zip | |
octoprint-plugins.m33-fio: 1.20 -> 1.21
| -rw-r--r-- | pkgs/applications/misc/octoprint/m33-fio-one-library.patch | 29 | ||||
| -rw-r--r-- | pkgs/applications/misc/octoprint/plugins.nix | 4 |
2 files changed, 20 insertions, 13 deletions
diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch index 87b00f3ab705..24c9c4a80f5d 100644 --- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch @@ -1,18 +1,18 @@ -From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001 +From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Wed, 23 Nov 2016 00:40:48 +0300 Subject: [PATCH] Build and use one version of preprocessor library --- - octoprint_m33fio/__init__.py | 67 ++---------------------------------------- - shared library source/Makefile | 62 +++----------------------------------- - 2 files changed, 6 insertions(+), 123 deletions(-) + octoprint_m33fio/__init__.py | 73 ++---------------------------------------- + shared library source/Makefile | 62 +++-------------------------------- + 2 files changed, 6 insertions(+), 129 deletions(-) diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index 4b43c59..d1259e4 100755 +index 054870a..4d5ecc1 100755 --- a/octoprint_m33fio/__init__.py +++ b/octoprint_m33fio/__init__.py -@@ -1062,71 +1062,8 @@ class M33FioPlugin( +@@ -1189,78 +1189,9 @@ class M33FioPlugin( # Check if using shared library or checking if it is usable if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : @@ -54,7 +54,9 @@ index 4b43c59..d1259e4 100755 - - # Otherwise check if running on Windows and using an i386 or x86-64 device - elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- ++ # Set shared library ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") + - # Check if Python is running as 32-bit - if platform.architecture()[0].startswith("32") : - @@ -81,11 +83,16 @@ index 4b43c59..d1259e4 100755 - - # Set shared library - self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") - +- +- # Otherwise check if running FreeBSD +- elif platform.uname()[0].startswith("FreeBSD") : +- +- # TODO: Compile FreeBSD shared library pre-processors +- pass +- # Check if shared library was set if self.sharedLibrary : + diff --git a/shared library source/Makefile b/shared library source/Makefile index 792b4f4..4c74f5c 100755 --- a/shared library source/Makefile @@ -164,5 +171,5 @@ index 792b4f4..4c74f5c 100755 clean: rm -f ../octoprint_m33fio/static/libraries/$(PROG) -- -2.11.0 +2.14.1 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index c09e8d2f5e66..0a1d26012a80 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,13 +12,13 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767"; + sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; }; patches = [ |