From 30f8203dd5e8282e97b1034660f7a69eb11b6e50 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 25 Jul 2019 10:45:10 -0400 Subject: [PATCH 1/9] pythonPackages.pyscreenshot: init at 0.5.1 --- .../python-modules/pyscreenshot/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pyscreenshot/default.nix diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix new file mode 100644 index 00000000000..9e9d15e5295 --- /dev/null +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, EasyProcess +}: + +buildPythonPackage rec { + pname = "pyscreenshot"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "19ec6d17a61c0cd4e7fcf3ab2685598a54b53dc781755393cc5f76dcb7bf359c"; + }; + + propagatedBuildInputs = [ + EasyProcess + ]; + + # recursive dependency on pyvirtualdisplay + doCheck = false; + + meta = with lib; { + description = "python screenshot"; + homepage = "https://github.com/ponty/pyscreenshot"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd583c54a8a..f4d60a56d9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1101,6 +1101,8 @@ in { pyschedule = callPackage ../development/python-modules/pyschedule { }; + pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; From a815aafdc7125e2efd360ef629cca2304d9f546c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 25 Jul 2019 10:45:36 -0400 Subject: [PATCH 2/9] pythonPackages.cadquery: init at 2.0RC0 --- .../python-modules/cadquery/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/cadquery/default.nix diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix new file mode 100644 index 00000000000..6ab80f610a9 --- /dev/null +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyparsing +, opencascade_oce +, pythonocc-core +}: + +buildPythonPackage rec { + pname = "cadquery"; + version = "2.0RC0"; + + src = fetchFromGitHub { + owner = "CadQuery"; + repo = pname; + rev = version; + sha256 = "1s5arr8w1mn60isaf44diqf72vyscy5ihns3072h16ysbl0b509s"; + }; + + buildInputs = [ + opencascade_oce + ]; + + propagatedBuildInputs = [ + pyparsing + pythonocc-core + ]; + + meta = with lib; { + description = "Parametric scripting language for creating and traversing CAD models"; + homepage = https://github.com/CadQuery/cadquery; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4d60a56d9b..81e0f2e469e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -497,6 +497,8 @@ in { cachy = callPackage ../development/python-modules/cachy { }; + cadquery = callPackage ../development/python-modules/cadquery { }; + catalogue = callPackage ../development/python-modules/catalogue { }; cdecimal = callPackage ../development/python-modules/cdecimal { }; From 248fe74a8ad81de83a4f002d8394bafcb67f0644 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 25 Jul 2019 11:04:22 -0400 Subject: [PATCH 3/9] pythonPackages.pytest-repeat: refactor fix broken build --- .../python-modules/pytest-repeat/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index afd36155cf7..768ad596734 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -8,33 +8,29 @@ buildPythonPackage rec { pname = "pytest-repeat"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0axbrpqal3cqw9zq6dakdbg49pnf5gvyvq6yn93hp1ayc7fnhzk3"; + sha256 = "1nbdmklpi0ra1jnfm032wz96y9nxdlcr4m9sjlnffwm7n4x43g2j"; }; - # fixes support for pytest >3.6. Should be droppable during the - # next bump. - patches = [ - (fetchpatch { - url = https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch; - sha256 = "00da1gmpq9pslcmm8pw93jcbp8j2zymzqdsm6jq3xinkvjpsbmny"; - }) + nativeBuildInputs = [ + setuptools_scm ]; - buildInputs = [ setuptools_scm ]; - checkInputs = [ pytest ]; + checkInputs = [ + pytest + ]; checkPhase = '' - py.test + pytest ''; - meta = { + meta = with lib; { description = "Pytest plugin for repeating tests"; - homepage = https://github.com/pytest-dev/pytest-repeat; - maintainers = with lib.maintainers; [ costrouc ]; - license = lib.licenses.mpl20; + homepage = "https://github.com/pytest-dev/pytest-repeat"; + license = licenses.mpl20; + maintainers = with maintainers; [ costrouc ]; }; } From 7fcc79d4b7f8bf7ae7fab13b04010b30243ad736 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 25 Jul 2019 11:05:02 -0400 Subject: [PATCH 4/9] pythonPackages.pytest-xvfb: init at 1.2.0 --- .../python-modules/pytest-xvfb/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-xvfb/default.nix diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix new file mode 100644 index 00000000000..b9ae9be428d --- /dev/null +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, virtual-display +}: + +buildPythonPackage rec { + pname = "pytest-xvfb"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979"; + }; + + propagatedBuildInputs = [ + pytest + virtual-display + ]; + + meta = with lib; { + description = "A pytest plugin to run Xvfb for tests"; + homepage = "https://github.com/The-Compiler/pytest-xvfb"; + license = licenses.mit; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81e0f2e469e..557a30df63d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1165,6 +1165,8 @@ in { pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + pytmx = callPackage ../development/python-modules/pytmx { }; python-binance = callPackage ../development/python-modules/python-binance { }; From 41d28d0ca4e9100e79baa21019a3ba21bb42ebbc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 25 Jul 2019 11:05:24 -0400 Subject: [PATCH 5/9] pythonPackages.pytest-qt: init at 3.2.2 --- .../python-modules/pytest-qt/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-qt/default.nix diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix new file mode 100644 index 00000000000..4ce0241f415 --- /dev/null +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pyqt5 +}: + +buildPythonPackage rec { + pname = "pytest-qt"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f6ecf4b38088ae1092cbd5beeaf714516d1f81f8938626a2eac546206cdfe7fa"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + pytest + ]; + + checkInputs = [ + pyqt5 + ]; + + # tests require X server + doCheck = false; + + meta = with lib; { + description = "pytest support for PyQt and PySide applications"; + homepage = "https://github.com/pytest-dev/pytest-qt"; + license = licenses.mit; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 557a30df63d..1b7bd53802b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1159,6 +1159,8 @@ in { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; From 1e05f755224ed9af9641fb6d5d28ddca3b8cfac3 Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Wed, 7 Aug 2019 16:24:47 +0930 Subject: [PATCH 6/9] maintainers: add marcus7070 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6751d00f451..d4da57f8578 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4162,6 +4162,12 @@ github = "marcweber"; githubId = 34086; name = "Marc Weber"; + }; + marcus7070 = { + email = "marcus@geosol.com.au"; + github = "marcus7070"; + githubId = 50230945; + name = "Marcus Boyd"; }; marenz = { email = "marenz@arkom.men"; From f29905dbdf0d81e5b9479e888379434be8b94fbb Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Wed, 7 Aug 2019 16:27:37 +0930 Subject: [PATCH 7/9] pythonPackages.cadquery: use CadQuery fork of pythonocc --- .../python-modules/cadquery/default.nix | 116 +++++++++++++----- 1 file changed, 87 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 6ab80f610a9..6f3632f743b 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -1,35 +1,93 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pyparsing -, opencascade_oce -, pythonocc-core + , buildPythonPackage + , isPy3k + , pythonOlder + , fetchFromGitHub + , pyparsing + , opencascade + , stdenv + , python + , cmake + , swig + , ninja + , smesh + , freetype + , libGL + , libGLU + , libX11 + , six }: -buildPythonPackage rec { - pname = "cadquery"; - version = "2.0RC0"; +let + pythonocc-core-cadquery = stdenv.mkDerivation { + pname = "pythonocc-core-cadquery"; + version = "0.18.2"; - src = fetchFromGitHub { - owner = "CadQuery"; - repo = pname; - rev = version; - sha256 = "1s5arr8w1mn60isaf44diqf72vyscy5ihns3072h16ysbl0b509s"; + src = fetchFromGitHub { + owner = "CadQuery"; + repo = "pythonocc-core"; + # no proper release to to use, this commit copied from the Anaconda receipe + rev = "701e924ae40701cbe6f9992bcbdc2ef22aa9b5ab"; + sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c"; + }; + + nativeBuildInputs = [ + cmake + swig + ninja + ]; + + buildInputs = [ + python + opencascade + smesh + freetype + libGL + libGLU + libX11 + ]; + + propagatedBuildInputs = [ + six + ]; + + cmakeFlags = [ + "-Wno-dev" + "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" + "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" + "-DSMESH_LIB_PATH=${smesh}/lib" + "-DPYTHONOCC_WRAP_SMESH=TRUE" + ]; }; - buildInputs = [ - opencascade_oce - ]; - - propagatedBuildInputs = [ - pyparsing - pythonocc-core - ]; - - meta = with lib; { - description = "Parametric scripting language for creating and traversing CAD models"; - homepage = https://github.com/CadQuery/cadquery; - license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; - }; -} +in + buildPythonPackage rec { + pname = "cadquery"; + version = "2.0RC0"; + + src = fetchFromGitHub { + owner = "CadQuery"; + repo = pname; + rev = version; + sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3"; + }; + + buildInputs = [ + opencascade + ]; + + propagatedBuildInputs = [ + pyparsing + pythonocc-core-cadquery + ]; + + # Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7). + disabled = !(isPy3k && (pythonOlder "3.8")); + + meta = with lib; { + description = "Parametric scripting language for creating and traversing CAD models"; + homepage = "https://github.com/CadQuery/cadquery"; + license = licenses.asl20; + maintainers = with maintainers; [ costrouc marcus7070 ]; + }; + } From c027ec5488161d1334fec799767d942d59c82fd0 Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Wed, 7 Aug 2019 16:43:33 +0930 Subject: [PATCH 8/9] pythonPackages.tinydb: init at v3.14.1 --- .../python-modules/tinydb/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/tinydb/default.nix diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix new file mode 100644 index 00000000000..f4de29b5e6c --- /dev/null +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, pytestcov +, pytestrunner +, pycodestyle +, pyyaml +}: + +buildPythonPackage rec { + pname = "tinydb"; + version = "v3.14.1"; + + src = fetchFromGitHub { + owner = "msiemens"; + repo = pname; + rev = version; + sha256 = "02idbvrm8j4mwsjfkzy11f4png19k307p53s4qa2ifzssysxpb96"; + }; + + nativeBuildInputs = [ + pytestrunner + ]; + + checkInputs = [ + pytest + pytestcov + pycodestyle + pyyaml + ]; + + meta = with lib; { + description = "A lightweight document oriented database written in pure Python with no external dependencies"; + homepage = "https://github.com/msiemens/tinydb"; + license = licenses.asl20; + maintainers = with maintainers; [ marcus7070 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b7bd53802b..805ec75f1c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5270,6 +5270,8 @@ in { tiros = callPackage ../development/python-modules/tiros { }; + tinydb = callPackage ../development/python-modules/tinydb { }; + tifffile = callPackage ../development/python-modules/tifffile { }; tmdb3 = callPackage ../development/python-modules/tmdb3 { }; From f033c3470fcfccb4cad462fd555e1a2849373eb9 Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Thu, 8 Aug 2019 11:28:41 +0930 Subject: [PATCH 9/9] cq-editor: init at 0.1RC1 --- .../graphics/cq-editor/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/graphics/cq-editor/default.nix diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix new file mode 100644 index 00000000000..32d079d85ff --- /dev/null +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -0,0 +1,57 @@ +{ lib +, mkDerivationWith +, python3Packages +, fetchFromGitHub +}: + +mkDerivationWith python3Packages.buildPythonApplication rec { + pname = "cq-editor"; + version = "0.1RC1"; + + src = fetchFromGitHub { + owner = "CadQuery"; + repo = "CQ-editor"; + rev = version; + sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax"; + }; + + propagatedBuildInputs = with python3Packages; [ + cadquery + Logbook + pyqt5 + pyparsing + pyqtgraph + spyder + pathpy + qtconsole + requests + ]; + + postFixup = '' + wrapQtApp "$out/bin/cq-editor" + ''; + + checkInputs = with python3Packages; [ + pytest + pytest-xvfb + pytest-mock + pytestcov + pytest-repeat + pytest-qt + ]; + + checkPhase = '' + pytest --no-xvfb + ''; + + # requires X server + doCheck = false; + + meta = with lib; { + description = "CadQuery GUI editor based on PyQT"; + homepage = "https://github.com/CadQuery/CQ-editor"; + license = licenses.asl20; + maintainers = with maintainers; [ costrouc marcus7070 ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f49075972e..c2ffac980de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18282,6 +18282,8 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; + cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; crun = callPackage ../applications/virtualization/crun {};