Merge pull request #221980 from wegank/printrun-wx

printrun: 2.0.0rc5 -> 2.0.0

authored by

Nikolay Korotkiy and committed by
GitHub
e5fb37a8 5911be30

+13 -9
+13 -9
pkgs/applications/misc/printrun/default.nix
··· 2 2 3 3 python3Packages.buildPythonApplication rec { 4 4 pname = "printrun"; 5 - version = "2.0.0rc5"; 5 + version = "2.0.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "kliment"; 9 9 repo = "Printrun"; 10 - rev = "${pname}-${version}"; 11 - sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; 10 + rev = "printrun-${version}"; 11 + hash = "sha256-ijJc0CVPiYW5VjTqhY1kO+Fy3dfuPoMn7KRhvcsdAZw="; 12 12 }; 13 13 14 + postPatch = '' 15 + substituteInPlace requirements.txt \ 16 + --replace "pyglet >= 1.1, < 2.0" "pyglet" \ 17 + --replace "cairosvg >= 1.0.9, < 2.6.0" "cairosvg" 18 + sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py 19 + ''; 20 + 14 21 nativeBuildInputs = [ glib wrapGAppsHook ]; 15 22 16 23 propagatedBuildInputs = with python3Packages; [ 17 - appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial 24 + appdirs cython dbus-python numpy six wxPython_4_2 psutil pyglet pyopengl pyserial cffi cairosvg lxml 18 25 ]; 19 26 27 + # pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None" 20 28 doCheck = false; 21 29 22 30 setupPyBuildFlags = ["-i"]; 23 - 24 - postPatch = '' 25 - sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py 26 - ''; 27 31 28 32 postInstall = '' 29 33 for f in $out/share/applications/*.desktop; do ··· 40 44 meta = with lib; { 41 45 description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; 42 46 homepage = "https://github.com/kliment/Printrun"; 43 - license = licenses.gpl3; 47 + license = licenses.gpl3Plus; 44 48 platforms = platforms.linux; 45 49 }; 46 50 }