commit 0ba77c4cbd41a02345218594583aaea5580f4349 · pyrox.dev/nixpkgs

+8 -8

pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch

···

       1
       1
       -
       From 73ff28c3ee5b737303871268a5487db0fcffc0f6 Mon Sep 17 00:00:00 2001

     

       1
       1
       +
       From 0be3198cccf753226758684955f49a32d8d920c0 Mon Sep 17 00:00:00 2001

     

       2
       2
        
       From: Nikolay Amiantov <ab@fmap.me>

     

       3
       3
        
       Date: Wed, 17 Feb 2016 14:37:31 +0300

     

       4
       4
       -
       Subject: [PATCH 1/2] Don't use static library

     

       4
       4
       +
       Subject: [PATCH] Don't use static library

     

       5
       5
        
       

     

       6
       6
        
       ---

     

       7
       7
        
        octoprint_m3dfio/__init__.py   | 67 +-----------------------------------------

     
···

       9
       9
        
        2 files changed, 5 insertions(+), 68 deletions(-)

     

       10
       10
        
       

     

       11
       11
        
       diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py

     

       12
       12
       -
       index 5e5369b..9f59768 100644

     

       12
       12
       +
       index a2ca533..43f178a 100644

     

       13
       13
        
       --- a/octoprint_m3dfio/__init__.py

     

       14
       14
        
       +++ b/octoprint_m3dfio/__init__.py

     

       15
       15
       -
       @@ -764,72 +764,7 @@ class M3DFioPlugin(

     

       15
       15
       +
       @@ -793,72 +793,7 @@ class M3DFioPlugin(

     

       16
       16
        
        		# Set file locations

     

       17
       17
        
        		self.setFileLocations()

     

       18
       18
        
        		

     

       19
       19
        
       -		# Check if running on Linux

     

       20
       20
        
       -		if platform.uname()[0].startswith("Linux") :

     

       21
       21
        
       -		

     

       22
       22
       -
       -			# Check if running on a Raspberry Pi

     

       22
       22
       +
       -			# Check if running on a Raspberry Pi 1

     

       23
       23
        
       -			if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :

     

       24
       24
        
       -			

     

       25
       25
        
       -				# Set shared library

     

       26
       26
        
       -				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so")

     

       27
       27
        
       -			

     

       28
       28
       -
       -			# Otherwise check if running on a Raspberry Pi 2

     

       28
       28
       +
       -			# Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3

     

       29
       29
        
       -			elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :

     

       30
       30
        
       -			

     

       31
       31
        
       -				# Set shared library

     
···

       87
       87
        
        		if self.sharedLibrary :

     

       88
       88
        
        		

     

       89
       89
        
       diff --git a/shared library source/Makefile b/shared library source/Makefile

     

       90
       90
       -
       index 4062a91..89dab71 100644

     

       90
       90
       +
       index 9d015a1..a24f134 100644

     

       91
       91
        
       --- a/shared library source/Makefile	

     

       92
       92
        
       +++ b/shared library source/Makefile	

     

       93
       93
        
       @@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64)

     
···

       109
       109
        
        clean:

     

       110
       110
        
        	rm -f ../octoprint_m3dfio/static/libraries/$(PROG)

     

       111
       111
        
       -- 

     

       112
       112
       -
       2.7.0

     

       112
       112
       +
       2.7.1

     

       113
       113

+2 -2

pkgs/applications/misc/octoprint/plugins.nix

···

       8
       8
        
       

     

       9
       9
        
         m3d-fio = buildPlugin rec {

     

       10
       10
        
           name = "M3D-Fio-${version}";

     

       11
       11
       -
           version = "0.28.2";

     

       11
       11
       +
           version = "0.29";

     

       12
       12
        
       

     

       13
       13
        
           src = fetchFromGitHub {

     

       14
       14
        
             owner = "donovan6000";

     

       15
       15
        
             repo = "M3D-Fio";

     

       16
       16
        
             rev = "V${version}";

     

       17
       17
       -
             sha256 = "1fwy6xmbid89rn7w7v779wb34gmfzc1fkggv3im1r7a7jrzph6nx";

     

       17
       17
       +
             sha256 = "17jyr7qf9psq3xcckk1zjhaw0h8a0mh3v8lcv9vgqzni27kq9pnb";

     

       18
       18
        
           };

     

       19
       19
        
       

     

       20
       20
        
           patches = [