diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-12 17:36:25 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-12 18:51:49 +0300 |
| commit | 0ba77c4cbd41a02345218594583aaea5580f4349 (patch) | |
| tree | 191cfcdf5b402cddff67a3d249ddf17348c39fc0 /pkgs/applications/misc/octoprint | |
| parent | ab2b2670c8b9addd675d77941db60ae45f9c672f (diff) | |
| download | nixpkgs-0ba77c4cbd41a02345218594583aaea5580f4349.tar nixpkgs-0ba77c4cbd41a02345218594583aaea5580f4349.tar.gz nixpkgs-0ba77c4cbd41a02345218594583aaea5580f4349.tar.bz2 nixpkgs-0ba77c4cbd41a02345218594583aaea5580f4349.tar.lz nixpkgs-0ba77c4cbd41a02345218594583aaea5580f4349.tar.xz nixpkgs-0ba77c4cbd41a02345218594583aaea5580f4349.tar.zst nixpkgs-0ba77c4cbd41a02345218594583aaea5580f4349.zip | |
octoprint-plugins.m3d-fio: 0.28.2 -> 0.29
Diffstat (limited to 'pkgs/applications/misc/octoprint')
| -rw-r--r-- | pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch | 16 | ||||
| -rw-r--r-- | pkgs/applications/misc/octoprint/plugins.nix | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch index 01b0c8f9cce..54116b80a6e 100644 --- a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch +++ b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch @@ -1,7 +1,7 @@ -From 73ff28c3ee5b737303871268a5487db0fcffc0f6 Mon Sep 17 00:00:00 2001 +From 0be3198cccf753226758684955f49a32d8d920c0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Wed, 17 Feb 2016 14:37:31 +0300 -Subject: [PATCH 1/2] Don't use static library +Subject: [PATCH] Don't use static library --- octoprint_m3dfio/__init__.py | 67 +----------------------------------------- @@ -9,23 +9,23 @@ Subject: [PATCH 1/2] Don't use static library 2 files changed, 5 insertions(+), 68 deletions(-) diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py -index 5e5369b..9f59768 100644 +index a2ca533..43f178a 100644 --- a/octoprint_m3dfio/__init__.py +++ b/octoprint_m3dfio/__init__.py -@@ -764,72 +764,7 @@ class M3DFioPlugin( +@@ -793,72 +793,7 @@ class M3DFioPlugin( # Set file locations self.setFileLocations() - # Check if running on Linux - if platform.uname()[0].startswith("Linux") : - -- # Check if running on a Raspberry Pi +- # Check if running on a Raspberry Pi 1 - if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : - - # Set shared library - self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so") - -- # Otherwise check if running on a Raspberry Pi 2 +- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 - elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : - - # Set shared library @@ -87,7 +87,7 @@ index 5e5369b..9f59768 100644 if self.sharedLibrary : diff --git a/shared library source/Makefile b/shared library source/Makefile -index 4062a91..89dab71 100644 +index 9d015a1..a24f134 100644 --- a/shared library source/Makefile +++ b/shared library source/Makefile @@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64) @@ -109,5 +109,5 @@ index 4062a91..89dab71 100644 clean: rm -f ../octoprint_m3dfio/static/libraries/$(PROG) -- -2.7.0 +2.7.1 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 1ae11be3cdd..d7927535f15 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -8,13 +8,13 @@ in { m3d-fio = buildPlugin rec { name = "M3D-Fio-${version}"; - version = "0.28.2"; + version = "0.29"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M3D-Fio"; rev = "V${version}"; - sha256 = "1fwy6xmbid89rn7w7v779wb34gmfzc1fkggv3im1r7a7jrzph6nx"; + sha256 = "17jyr7qf9psq3xcckk1zjhaw0h8a0mh3v8lcv9vgqzni27kq9pnb"; }; patches = [ |