diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-05 12:56:25 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-05 12:56:25 +0100 |
| commit | 1227158d0bca760c9feed21e6e565dc888c530c6 (patch) | |
| tree | 791d2116dcf07a02168507be14138207f9426c33 /pkgs/top-level | |
| parent | d4bfb57f40e853c1d19823841b056094b2586ded (diff) | |
| parent | e72e35d655a99f61aa9d7f604a7c230c9b871eb3 (diff) | |
| download | nixlib-1227158d0bca760c9feed21e6e565dc888c530c6.tar nixlib-1227158d0bca760c9feed21e6e565dc888c530c6.tar.gz nixlib-1227158d0bca760c9feed21e6e565dc888c530c6.tar.bz2 nixlib-1227158d0bca760c9feed21e6e565dc888c530c6.tar.lz nixlib-1227158d0bca760c9feed21e6e565dc888c530c6.tar.xz nixlib-1227158d0bca760c9feed21e6e565dc888c530c6.tar.zst nixlib-1227158d0bca760c9feed21e6e565dc888c530c6.zip | |
Merge remote-tracking branch 'origin/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 | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 678b2d2a86a3..5c44433244c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1760,6 +1760,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + distrobox = callPackage ../applications/virtualization/distrobox { }; + djmount = callPackage ../tools/filesystems/djmount { }; dgsh = callPackage ../shells/dgsh { }; @@ -28958,6 +28960,8 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; + skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { }; + soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan; @@ -29548,6 +29552,8 @@ with pkgs; qtile = callPackage ../applications/window-managers/qtile { }; + vimgolf = callPackage ../games/vimgolf { }; + vimpc = callPackage ../applications/audio/vimpc { }; # this is a lower-level alternative to wrapNeovim conceived to handle diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e0c6ca5ffb5..2adf90c22425 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -704,6 +704,8 @@ in { asyncpg = callPackage ../development/python-modules/asyncpg { }; + asyncsleepiq = callPackage ../development/python-modules/asyncsleepiq { }; + asyncssh = callPackage ../development/python-modules/asyncssh { }; asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; @@ -3567,6 +3569,8 @@ in { growattserver = callPackage ../development/python-modules/growattserver { }; + gridnet = callPackage ../development/python-modules/gridnet { }; + grip = callPackage ../development/python-modules/grip { }; groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { }; @@ -8215,6 +8219,8 @@ in { python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + python-trovo = callPackage ../development/python-modules/python-trovo { }; + python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; python-twitter = callPackage ../development/python-modules/python-twitter { }; @@ -8543,6 +8549,8 @@ in { radio_beam = callPackage ../development/python-modules/radio_beam { }; + radios = callPackage ../development/python-modules/radios { }; + radiotherm = callPackage ../development/python-modules/radiotherm { }; radish-bdd = callPackage ../development/python-modules/radish-bdd { }; |