mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

Merge pull request #33799 from adisbladis/cura-qt59

Browse source 
cura: 3.0.3 -> 3.1.0
This commit is contained in:
Jörg Thalheim 2018-01-13 18:19:22 +00:00 committed by GitHub
parent 6ccb554f3b 0e30e9b7ae
commit e35639b931
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,13 +2,13 @@
mkDerivation rec { mkDerivation rec {
name = "cura-${version}"; name = "cura-${version}";
version = "3.0.3"; version = "3.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "Cura"; repo = "Cura";
rev = version; rev = version;
sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa"; sha256 = "1x732bzxdxnz1av8jlv5kzs08jpmsg6bz9i88jr63kw32d901xsm";
}; };
buildInputs = [ qtbase qtquickcontrols ]; buildInputs = [ qtbase qtquickcontrols ];

8
pkgs/development/python-modules/python-utils/default.nix
View file

@ -14,6 +14,14 @@ buildPythonPackage rec {
checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ];
postPatch = ''
# pytest-runner is only actually required in checkPhase
substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," ""
'';
# Tests failing
doCheck = false;
checkPhase = '' checkPhase = ''
rm nix_run_setup.py rm nix_run_setup.py
py.test py.test

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

@ -5,17 +5,17 @@ then throw "Uranium not supported for interpreter ${python.executable}"
else else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.3"; version = "3.1.0";
pname = "uranium"; pname = "uranium";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "Uranium"; repo = "Uranium";
rev = version; rev = version;
sha256 = "1pyzpcdb6kb0basvhgpjdiws8x0bwl71k7nkf3j3s9wk1dvyw824"; sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk";
}; };
buildInputs = [ python gettext ]; buildInputs = [ python gettext ];
propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
nativeBuildInputs = [ cmake doxygen ]; nativeBuildInputs = [ cmake doxygen ];

2
pkgs/top-level/all-packages.nix
View file

@ -16978,7 +16978,7 @@ with pkgs;
curaengine = callPackage ../applications/misc/curaengine { curaengine = callPackage ../applications/misc/curaengine {
inherit (python3.pkgs) libarcus; inherit (python3.pkgs) libarcus;
}; };
cura = qt56.callPackage ../applications/misc/cura { }; cura = qt5.callPackage ../applications/misc/cura { };
curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { };

9
pkgs/top-level/python-packages.nix
View file

@ -320,10 +320,6 @@ in {
pythonPackages = self; pythonPackages = self;
}; };
pyqt56 = pkgs.libsForQt56.callPackage ../development/python-modules/pyqt/5.x.nix {
pythonPackages = self;
};
pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {
pythonPackages = self; pythonPackages = self;
}; };
@ -22543,10 +22539,7 @@ EOF
twilio = callPackage ../development/python-modules/twilio { }; twilio = callPackage ../development/python-modules/twilio { };
uranium = callPackage ../development/python-modules/uranium { uranium = callPackage ../development/python-modules/uranium { };
# https://github.com/Ultimaker/Cura/issues/2596
pyqt5 = self.pyqt56;
};
vine = callPackage ../development/python-modules/vine { }; vine = callPackage ../development/python-modules/vine { };