diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-30 19:44:51 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-30 19:44:51 +0100 |
| commit | a69ad18da9aa6a77b18986cc1f97b7bf6df44f08 (patch) | |
| tree | a6f62188d4d43c7235bebe54583628fd8cb17539 /pkgs/top-level | |
| parent | d14baf7747b0d8e17c0a13db673b28f13e06a349 (diff) | |
| parent | 1edd4ceb6163ce265b17b80f243e882cce2278ee (diff) | |
| download | nixpkgs-a69ad18da9aa6a77b18986cc1f97b7bf6df44f08.tar nixpkgs-a69ad18da9aa6a77b18986cc1f97b7bf6df44f08.tar.gz nixpkgs-a69ad18da9aa6a77b18986cc1f97b7bf6df44f08.tar.bz2 nixpkgs-a69ad18da9aa6a77b18986cc1f97b7bf6df44f08.tar.lz nixpkgs-a69ad18da9aa6a77b18986cc1f97b7bf6df44f08.tar.xz nixpkgs-a69ad18da9aa6a77b18986cc1f97b7bf6df44f08.tar.zst nixpkgs-a69ad18da9aa6a77b18986cc1f97b7bf6df44f08.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3307e2810c..cca5aad0200 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -724,6 +724,8 @@ in brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + boxes = callPackage ../tools/text/boxes { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -8335,6 +8337,8 @@ in jasmin = callPackage ../development/compilers/jasmin { }; + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; julia_07 = callPackage ../development/compilers/julia/0.7.nix { @@ -18247,6 +18251,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 { }; |