diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-08 00:02:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 00:02:02 +0000 |
| commit | 555fb8b14653c1f2714973cfee7b0c73417b0547 (patch) | |
| tree | 1bd5e309f01f461f96812198cbea496c5e4222e5 /pkgs/top-level | |
| parent | 2fa8dd529ab62044054c3a8fd7fa1b3d693d4fdc (diff) | |
| parent | b7deb4cf7598330a450b8ad2174424daa1611e8b (diff) | |
| download | nixlib-555fb8b14653c1f2714973cfee7b0c73417b0547.tar nixlib-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.gz nixlib-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.bz2 nixlib-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.lz nixlib-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.xz nixlib-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.zst nixlib-555fb8b14653c1f2714973cfee7b0c73417b0547.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84462b74966e..0f6d12827ae6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4489,6 +4489,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + cobang = python3Packages.callPackage ../applications/misc/cobang { + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; + }; + cocoapods = callPackage ../development/mobile/cocoapods { }; cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4e0f922e168e..4718d942d8ee 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -97,6 +97,7 @@ mapAliases ({ python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 + pytwitchapi = twitchapi; # added 2022-03-07 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2adf90c22425..07af0ca6c476 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4466,6 +4466,8 @@ in { kinparse = callPackage ../development/python-modules/kinparse { }; + kiss-headers = callPackage ../development/python-modules/kiss-headers { }; + kitchen = callPackage ../development/python-modules/kitchen { }; kivy = callPackage ../development/python-modules/kivy { @@ -8249,6 +8251,8 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + python-zbar = callPackage ../development/python-modules/python-zbar { }; + pythran = callPackage ../development/python-modules/pythran { inherit (pkgs.llvmPackages) openmp; }; @@ -8315,8 +8319,6 @@ in { pytweening = callPackage ../development/python-modules/pytweening { }; - pytwitchapi = callPackage ../development/python-modules/pytwitchapi { }; - pytz = callPackage ../development/python-modules/pytz { }; pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { }; @@ -9170,6 +9172,8 @@ in { simpy = callPackage ../development/python-modules/simpy { }; + single-version = callPackage ../development/python-modules/single-version { }; + signify = callPackage ../development/python-modules/signify { }; siosocks = callPackage ../development/python-modules/siosocks { }; |