diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-02 18:05:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-02 18:05:41 +0000 |
| commit | a97d52b3484b545c32b0a5a2d35b589fa435a074 (patch) | |
| tree | da17b9079768a4a089dfffcdc25d7fc0f5776bf0 /pkgs/top-level | |
| parent | 12423e2e92378862924e1f4ea3f51364852338b8 (diff) | |
| parent | 863e8630df64e986730651b2f14302da16ca71e4 (diff) | |
| download | nixlib-a97d52b3484b545c32b0a5a2d35b589fa435a074.tar nixlib-a97d52b3484b545c32b0a5a2d35b589fa435a074.tar.gz nixlib-a97d52b3484b545c32b0a5a2d35b589fa435a074.tar.bz2 nixlib-a97d52b3484b545c32b0a5a2d35b589fa435a074.tar.lz nixlib-a97d52b3484b545c32b0a5a2d35b589fa435a074.tar.xz nixlib-a97d52b3484b545c32b0a5a2d35b589fa435a074.tar.zst nixlib-a97d52b3484b545c32b0a5a2d35b589fa435a074.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cae4a790a47..0b4a208c1c92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -549,6 +549,10 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; + opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; + + owl = callPackage ../tools/networking/owl { }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; @@ -18581,6 +18585,8 @@ with pkgs; libptytty = callPackage ../development/libraries/libptytty { }; + libpulsar = callPackage ../development/libraries/libpulsar { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { @@ -21492,6 +21498,7 @@ with pkgs; openresty = callPackage ../servers/http/openresty { withPerl = false; + modules = []; }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; @@ -34201,6 +34208,8 @@ with pkgs; xosview2 = callPackage ../tools/X11/xosview2 { }; + xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { }; + xpad = callPackage ../applications/misc/xpad { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8490870e5894..5f043faecfd7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -462,6 +462,8 @@ in { xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; + xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null; + xpadneo = callPackage ../os-specific/linux/xpadneo { }; zenpower = callPackage ../os-specific/linux/zenpower { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8be1c2205dfe..2f3ba8705a70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3017,6 +3017,8 @@ in { flax = callPackage ../development/python-modules/flax { }; + fleep = callPackage ../development/python-modules/fleep { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; @@ -5460,6 +5462,8 @@ in { nextcloudmonitor = callPackage ../development/python-modules/nextcloudmonitor { }; + nextcord = callPackage ../development/python-modules/nextcord { }; + nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; |