swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 21:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #150544 from Stunkymonkey/cura-fix

Browse source 
cura: 4.10.0 -> 4.12.1, cura_stable: fix
This commit is contained in:
Gabriel Ebner 2021-12-21 18:52:22 +01:00 committed by GitHub
parent 8b8fa4e819 66e037cf8e
commit 9e624dea71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/cura/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "cura";
version = "4.10.0";
version = "4.12.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
sha256 = "0v65xg31rw4kc7f98k8zz0kmhrp9m55k8ahblha9r1vr4krcf30z";
sha256 = "sha256-QvX9o1nrYmY6zzPcxl+xD6JTMdphzT/is1SMYrISu4o=";
};
materials = fetchFromGitHub {

21
pkgs/applications/misc/cura/stable.nix
View file

@ -1,15 +1,14 @@
{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
let
py = python27Packages;
version = "15.04";
in
{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "cura";
inherit version;
version = "15.06.03";
src = fetchurl {
url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl";
src = fetchFromGitHub {
owner = "daid";
repo = "Cura";
rev = version;
sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA=";
};
desktopItem = makeDesktopItem {
@ -22,13 +21,13 @@ stdenv.mkDerivation rec {
categories = "GNOME;GTK;Utility;";
};
python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ];
pythonPath = python_deps;
propagatedBuildInputs = python_deps;
buildInputs = [ curaengine py.wrapPython ];
buildInputs = [ curaengine python27Packages.wrapPython ];
configurePhase = "";
buildPhase = "";

4
pkgs/applications/misc/curaengine/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "curaengine";
version = "4.10.0";
version = "4.12.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
sha256 = "sha256-t5i6s0KKcaoMqzDxZ6JL1NyKP33uxWdmyziK3xh8q88=";
sha256 = "sha256-+sjysxOaNLq6p3yCoB1qKosBO5Cg2/1o7xmUtZ15wkE=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/development/libraries/libnest2d/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
stdenv.mkDerivation rec {
version = "2020-10-09-unstable";
version = "4.12.0";
pname = "libnest2d";
# This revision is waiting to be merged upstream

4
pkgs/development/python-modules/libarcus/default.nix
View file

@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "libarcus";
version = "4.10.0";
version = "4.12.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libArcus";
rev = version;
sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf";
sha256 = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w=";
};
patches = [

4
pkgs/development/python-modules/libsavitar/default.nix
View file

@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "libsavitar";
version = "4.10.0";
version = "4.12.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libSavitar";
rev = version;
sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp";
sha256 = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA=";
};
postPatch = ''

4
pkgs/development/python-modules/pynest2d/default.nix
View file

@ -2,7 +2,7 @@
, libnest2d, sip_4, clipper }:
buildPythonPackage rec {
version = "4.10.0";
version = "4.12.0";
pname = "pynest2d";
format = "other";
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "Ultimaker";
repo = "pynest2d";
rev = version;
sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk";
sha256 = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo=";
};
propagatedBuildInputs = [ libnest2d sip_4 clipper ];

4
pkgs/development/python-modules/uranium/default.nix
View file

@ -2,7 +2,7 @@
, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }:
buildPythonPackage rec {
version = "4.10.0";
version = "4.12.0";
pname = "uranium";
format = "other";
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "Ultimaker";
repo = "Uranium";
rev = version;
sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng";
sha256 = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk=";
};
disabled = pythonOlder "3.5.0";