git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #142660 from charles-dyfis-net/remove-curaLulzbot

curaLulzbot: remove

commitf554a35bb9c72ac839a1d1f7bb377a075b06b95d authorBobby Rong <rjl931189261@126.com> dateSat 23 Oct 2021, 22:38 (5 years ago) parentc1981eb3e84134
8 files changed+1−262
pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch−47 pkgs/applications/misc/cura/lulzbot/curaengine.nix−27 pkgs/applications/misc/cura/lulzbot/default.nix−82 pkgs/applications/misc/cura/lulzbot/libarcus.nix−33 pkgs/applications/misc/cura/lulzbot/libsavitar.nix−33 pkgs/applications/misc/cura/lulzbot/uranium.nix−38 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patchdeleted−47
@@ -1,47 +0,0 @@
1−# Notes by Charles Duffy <charles@dyfis.net> --
2−#
3−# - The new version of OpenMP does not allow outside variables to be referenced
4−# *at all* without an explicit declaration of how they're supposed to be
5−# handled. Thus, this was an outright build failure beforehand. The new
6−# pragmas copy the initial value from the outer scope into each parallel
7−# thread. Since these variables are all constant within the loops, this is
8−# clearly correct. (Not sure it's *optimal*, but quite sure it isn't
9−# *wrong*).
10−# - Upstream has been contacted -- I'm a Lulzbot customer with an active
11−# support contract and sent them the patch. That said, they're in the middle
12−# of some major corporate churn (sold themselves out of near-bankruptcy to an
13−# out-of-state business entity formed as a holding company; moved to that
14−# state; have been slowly restaffing after), so a response may take a while.
15−# - The patch is purely my own work.
16−
17−--- curaengine/src/support.cpp.orig 2020-03-28 10:38:01.953912363 -0500
18−+++ curaengine/src/support.cpp 2020-03-28 10:45:28.999791908 -0500
19−@@ -854,7 +854,7 @@
20− const double tan_angle = tan(angle) - 0.01; // the XY-component of the supportAngle
21− xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, false).offset(xy_distance);
22− // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area
23−- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
24−+ #pragma omp parallel for default(none) firstprivate(layer_count, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top, tan_angle, xy_distance, xy_distance_overhang) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
25− for (unsigned int layer_idx = 1; layer_idx < layer_count; layer_idx++)
26− {
27− Polygons outlines = storage.getLayerOutlines(layer_idx, false);
28−@@ -1054,7 +1054,7 @@
29− const int max_checking_layer_idx = std::min(static_cast<int>(storage.support.supportLayers.size())
30− , static_cast<int>(layer_count - (layer_z_distance_top - 1)));
31− const size_t max_checking_idx_size_t = std::max(0, max_checking_layer_idx);
32−-#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic)
33−+#pragma omp parallel for default(none) firstprivate(max_checking_idx_size_t, layer_z_distance_top) shared(support_areas, storage) schedule(dynamic)
34− for (size_t layer_idx = 0; layer_idx < max_checking_idx_size_t; layer_idx++)
35− {
36− support_areas[layer_idx] = support_areas[layer_idx].difference(storage.getLayerOutlines(layer_idx + layer_z_distance_top - 1, false));
37−--- curaengine/src/layerPart.cpp.orig 2020-03-28 10:36:40.381023651 -0500
38−+++ curaengine/src/layerPart.cpp 2020-03-28 10:39:54.584140465 -0500
39−@@ -49,7 +49,7 @@
40− {
41− const auto total_layers = slicer->layers.size();
42− assert(mesh.layers.size() == total_layers);
43−-#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic)
44−+#pragma omp parallel for default(none) firstprivate(total_layers) shared(mesh, slicer) schedule(dynamic)
45− for (unsigned int layer_nr = 0; layer_nr < total_layers; layer_nr++)
46− {
47− SliceLayer& layer_storage = mesh.layers[layer_nr];
pkgs/applications/misc/cura/lulzbot/curaengine.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ lib, gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
2−
3−gcc8Stdenv.mkDerivation rec {
4− pname = "curaengine-lulzBot";
5− version = "3.6.21";
6−
7− src = fetchgit {
8− url = "https://code.alephobjects.com/source/curaengine-lulzbot.git";
9− rev = "ec6a1a0f0aa387ef97e5c106633cf8d7fb9cd00d";
10− sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8";
11− };
12−
13− patches = [ ./curaengine-openmp-compat.patch ];
14−
15− nativeBuildInputs = [ cmake ];
16− buildInputs = [ libarcusLulzbot stb protobuf ];
17−
18− cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
19−
20− meta = with lib; {
21− description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
22− homepage = "https://code.alephobjects.com/source/curaengine-lulzbot/";
23− license = licenses.agpl3;
24− platforms = platforms.linux;
25− maintainers = with maintainers; [ chaduffy ];
26− };
27−}
pkgs/applications/misc/cura/lulzbot/default.nixdeleted−82
@@ -1,82 +0,0 @@
1−{ lib, mkDerivation, wrapQtAppsHook, callPackage, fetchgit, cmake, jq, python3, qtbase, qtquickcontrols2 }:
2−
3−let
4− # admittedly, we're using (printer firmware) blobs when we could compile them ourselves.
5− curaBinaryDataVersion = "3.6.21"; # Marlin v2.0.0.174 for Bio, v2.0.0.144 for others.
6− curaBinaryData = fetchgit {
7− url = "https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git";
8− rev = "5c75d0f6c10d8b7a903e2072a48cd1f08059509e";
9− sha256 = "1qdsj6rczwzdwzyr7nz7fnypbphckjrnwl8c9dr6izsxyzs465c4";
10− };
11−
12− libarcusLulzbot = callPackage ./libarcus.nix {
13− inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
14− };
15− libsavitarLulzbot = callPackage ./libsavitar.nix {
16− inherit (python3.pkgs) buildPythonPackage sip_4 pythonOlder;
17− };
18−
19− inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
20− curaengine = callPackage ./curaengine.nix {
21− inherit libarcusLulzbot;
22− };
23− uraniumLulzbot = callPackage ./uranium.nix {
24− inherit callPackage libarcusLulzbot;
25− inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
26− };
27−in
28−mkDerivation rec {
29− pname = "cura-lulzbot";
30− version = "3.6.21";
31−
32− src = fetchgit {
33− url = "https://code.alephobjects.com/source/cura-lulzbot.git";
34− rev = "7faeb18604c83004846a02c60cb240708db0034f";
35− sha256 = "10q38s8c8x6xkh1vns4p3iqa5y267vrjh5vq8h55mg1q5001scyq";
36− };
37−
38− buildInputs = [ qtbase qtquickcontrols2 ];
39− # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415
40− propagatedBuildInputs = with python3.pkgs; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
41− nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
42−
43− cmakeFlags = [
44− "-DURANIUM_DIR=${uraniumLulzbot.src}"
45− "-DCURA_VERSION=${version}"
46− ];
47−
48− postPatch = ''
49− sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
50− sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
51− '';
52−
53− preFixup = ''
54− substituteInPlace "$out/bin/cura-lulzbot" --replace 'import cura.CuraApplication' 'import Savitar; import cura.CuraApplication'
55− ln -sT "${curaBinaryData}/cura/resources/firmware" "$out/share/cura/resources/firmware"
56− ln -sT "${uraniumLulzbot}/share/uranium" "$out/share/uranium"
57− ${jq}/bin/jq --arg out "$out" '.build=$out' >"$out/version.json" <<'EOF'
58− ${builtins.toJSON {
59− cura = version;
60− cura_version = version;
61− binarydata = curaBinaryDataVersion;
62− engine = curaengine.version;
63− libarcus = libarcusLulzbot.version;
64− libsavitar = libsavitarLulzbot.version;
65− uranium = uraniumLulzbot.version;
66− }}
67− EOF
68− '';
69−
70− postFixup = ''
71− wrapPythonPrograms
72− wrapQtApp "$out/bin/cura-lulzbot"
73− '';
74−
75− meta = with lib; {
76− description = "3D printer / slicing GUI built on top of the Uranium framework";
77− homepage = "https://code.alephobjects.com/diffusion/CURA/";
78− license = licenses.agpl3; # a partial relicense to LGPL has happened, but not certain that all AGPL bits are expunged
79− platforms = platforms.linux;
80− maintainers = with maintainers; [ chaduffy ];
81− };
82−}
pkgs/applications/misc/cura/lulzbot/libarcus.nixdeleted−33
@@ -1,33 +0,0 @@
1−{ lib, buildPythonPackage, fetchgit, fetchurl, cmake, sip_4, protobuf, pythonOlder }:
2−
3−buildPythonPackage {
4− pname = "libarcus";
5− version = "3.6.21";
6− format = "other";
7−
8− src = fetchgit {
9− url = "https://code.alephobjects.com/source/arcus.git";
10− rev = "aeda02d7727f45b657afb72cef203283fbf09325";
11− sha256 = "1ak0d4k745sx7paic27was3s4987z9h3czscjs21hxbi6qy83g99";
12− };
13−
14− disabled = pythonOlder "3.4.0";
15−
16− propagatedBuildInputs = [ sip_4 ];
17− nativeBuildInputs = [ cmake ];
18− buildInputs = [ protobuf ];
19−
20− postPatch = ''
21− # To workaround buggy SIP detection which overrides PYTHONPATH
22− sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
23− '';
24−
25− meta = with lib; {
26− description = "Communication library between internal components for Ultimaker software";
27− homepage = "https://code.alephobjects.com/source/arcus/";
28− license = licenses.lgpl3Plus;
29− platforms = platforms.linux;
30− maintainers = with maintainers; [ chaduffy ];
31− };
32−}
33−
pkgs/applications/misc/cura/lulzbot/libsavitar.nixdeleted−33
@@ -1,33 +0,0 @@
1−{ lib, buildPythonPackage, pythonOlder, fetchgit, cmake, sip_4 }:
2−
3−buildPythonPackage {
4− pname = "libsavitar-lulzbot";
5− name = "libsavitar-lulzbot";
6− version = "3.6.21";
7− format = "other";
8−
9− src = fetchgit {
10− url = "https://code.alephobjects.com/source/savitar.git";
11− rev = "ee8ada42c55f54727ce4d275c294ba426d3d8234";
12− sha256 = "1wm5ii3cmni8dk3c65kw4wglpypkdsfpgd480d3hc1r5bqpq0d6j";
13− };
14−
15− postPatch = ''
16− # To workaround buggy SIP detection which overrides PYTHONPATH
17− sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
18− '';
19−
20− nativeBuildInputs = [ cmake ];
21−
22− propagatedBuildInputs = [ sip_4 ];
23−
24− disabled = pythonOlder "3.4.0";
25−
26− meta = with lib; {
27− description = "C++ implementation of 3mf loading with SIP python bindings";
28− homepage = "https://github.com/Ultimaker/libSavitar";
29− license = licenses.lgpl3Plus;
30− platforms = platforms.unix;
31− maintainers = with maintainers; [ chaduffy ];
32− };
33−}
pkgs/applications/misc/cura/lulzbot/uranium.nixdeleted−38
@@ -1,38 +0,0 @@
1−{ lib, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
2−, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
3−
4−buildPythonPackage {
5− version = "3.6.21";
6− pname = "uranium";
7− name = "uraniumLulzbot";
8− format = "other";
9−
10− src = fetchgit {
11− url = "https://code.alephobjects.com/diffusion/U/uranium.git";
12− rev = "54d911edd2551c5875c554928896122835a0dd6c";
13− sha256 = "04bym3vwikaxw8ab0mymv9sc9n8i7yw5kfsv99ic811g9lzz3j1i";
14− };
15−
16− disabled = pythonOlder "3.5.0";
17−
18− buildInputs = [ python gettext ];
19− propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ];
20− nativeBuildInputs = [ cmake doxygen ];
21−
22− postPatch = ''
23− sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
24− sed -i \
25− -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \
26− -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \
27− UM/Application.py
28− '';
29−
30− meta = with lib; {
31− description = "A Python framework for building Desktop applications";
32− homepage = "https://code.alephobjects.com/diffusion/U/";
33− license = licenses.lgpl3Plus;
34− platforms = platforms.linux;
35− maintainers = with maintainers; [ chaduffy ];
36− };
37−}
38−
pkgs/top-level/aliases.nix+1
@@ -164,6 +164,7 @@ mapAliases ({
164164 cupsBjnp = cups-bjnp; # added 2016-01-02
165165 cups_filters = cups-filters; # added 2016-08
166166 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
167+ curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23
167168 cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15
168169 cv = progress; # added 2015-09-06
169170 cvs_fast_export = cvs-fast-export; # added 2021-06-10
pkgs/top-level/all-packages.nix−2
@@ -27858,8 +27858,6 @@ with pkgs;
2785827858
2785927859 curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
2786027860
27861− curaLulzbot = libsForQt5.callPackage ../applications/misc/cura/lulzbot/default.nix { };
27862−
2786327861 curaByDagoma = callPackage ../applications/misc/curabydagoma { };
2786427862
2786527863 peru = callPackage ../applications/version-management/peru {};