about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorCharles Duffy <charles@dyfis.net>2019-05-05 18:31:51 -0500
committerCharles Duffy <charles@dyfis.net>2019-08-02 19:36:33 -0500
commit0ca75bc294d38a420f67307b6de6ac1fd5d93620 (patch)
tree35a443f449ed3c8c2ce42bfb10271dd3c21657a9 /pkgs/top-level
parent86c11030ee9c963f114d627b19f1a410b95ce3c8 (diff)
downloadnixlib-0ca75bc294d38a420f67307b6de6ac1fd5d93620.tar
nixlib-0ca75bc294d38a420f67307b6de6ac1fd5d93620.tar.gz
nixlib-0ca75bc294d38a420f67307b6de6ac1fd5d93620.tar.bz2
nixlib-0ca75bc294d38a420f67307b6de6ac1fd5d93620.tar.lz
nixlib-0ca75bc294d38a420f67307b6de6ac1fd5d93620.tar.xz
nixlib-0ca75bc294d38a420f67307b6de6ac1fd5d93620.tar.zst
nixlib-0ca75bc294d38a420f67307b6de6ac1fd5d93620.zip
curaLulzbot: 15.02.1-1.03-5064 -> 3.6.18
Move Cura Lulzbot Edition to be based on the same generation of the
codebase as the upstream (Ultimaker) branch, away from a many-year-old
legacy tree.

Since prior Lulzbot Edition packaging simply wrapped binaries unpacked
from Debian binary packages, doing this right requires forking the same
dependencies that Lulzbot has branched themselves as well.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
-rw-r--r--pkgs/top-level/python-packages.nix3
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2c1c10f5cf8..8e28a4dd65f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20203,14 +20203,14 @@ in
     curaengine = curaengine_stable;
   };
 
-  curaengine = callPackage ../applications/misc/curaengine {
-    inherit (python3.pkgs) libarcus;
-  };
+  curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; };
+  curaengineLulzbot = callPackage ../applications/misc/curaengine/lulzbot.nix { inherit (python3.pkgs) libarcusLulzbot; };
+
   cura = qt5.callPackage ../applications/misc/cura { };
 
   curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
 
-  curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { };
+  curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot.nix { };
 
   curaByDagoma = callPackage ../applications/misc/curabydagoma { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e957fe5746c5..62586866c261 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3238,6 +3238,7 @@ in {
   fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
 
   libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };
+  libarcusLulzbot = callPackage ../development/python-modules/libarcus/lulzbot.nix { inherit (pkgs) protobuf; };
 
   libcloud = callPackage ../development/python-modules/libcloud { };
 
@@ -3258,6 +3259,7 @@ in {
   };
 
   libsavitar = callPackage ../development/python-modules/libsavitar { };
+  libsavitarLulzbot = callPackage ../development/python-modules/libsavitar/lulzbot.nix { };
 
   libplist = disabledIf isPy3k
     (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
@@ -5537,6 +5539,7 @@ in {
   twilio = callPackage ../development/python-modules/twilio { };
 
   uranium = callPackage ../development/python-modules/uranium { };
+  uraniumLulzbot = callPackage ../development/python-modules/uranium/lulzbot.nix { };
 
   uuid = callPackage ../development/python-modules/uuid { };