diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-30 11:09:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-30 11:09:30 +0000 |
| commit | e8f2764fe8d6880b5f486c82e629c73ec9a96817 (patch) | |
| tree | 64054c195a52b255a2e3ae198083826ce458c47a /pkgs/top-level | |
| parent | 5d2d5d3a9e6d78c90a8b8cd2af953fa85046318d (diff) | |
| parent | f033c3470fcfccb4cad462fd555e1a2849373eb9 (diff) | |
| download | nixpkgs-e8f2764fe8d6880b5f486c82e629c73ec9a96817.tar nixpkgs-e8f2764fe8d6880b5f486c82e629c73ec9a96817.tar.gz nixpkgs-e8f2764fe8d6880b5f486c82e629c73ec9a96817.tar.bz2 nixpkgs-e8f2764fe8d6880b5f486c82e629c73ec9a96817.tar.lz nixpkgs-e8f2764fe8d6880b5f486c82e629c73ec9a96817.tar.xz nixpkgs-e8f2764fe8d6880b5f486c82e629c73ec9a96817.tar.zst nixpkgs-e8f2764fe8d6880b5f486c82e629c73ec9a96817.zip | |
Merge pull request #66254 from marcus7070/cadquery-and-friends-init
pythonPackages.cadquery: init at 2.0RC0 & cq-editor: init at 0.1RC1
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d9ea22e176..3db18945819 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18295,6 +18295,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 {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 666df8ee53d..a496fee16a2 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 { }; @@ -1101,6 +1103,8 @@ in { pyschedule = callPackage ../development/python-modules/pyschedule { }; + pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -1155,12 +1159,16 @@ 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 { }; 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 { }; @@ -5264,6 +5272,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 { }; |