diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-27 00:06:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 00:06:31 +0000 |
| commit | 088eead34aa975dbd76c36d9a85c539d188551e0 (patch) | |
| tree | 1b7d3372f83fd3bb3395f429b52d80863aecf764 /pkgs/top-level | |
| parent | 59a37c822b7d029047a46587460b37d0a4caf6f1 (diff) | |
| parent | ea4a87537cfdc83eebcd1804a5ec51057018784f (diff) | |
| download | nixpkgs-088eead34aa975dbd76c36d9a85c539d188551e0.tar nixpkgs-088eead34aa975dbd76c36d9a85c539d188551e0.tar.gz nixpkgs-088eead34aa975dbd76c36d9a85c539d188551e0.tar.bz2 nixpkgs-088eead34aa975dbd76c36d9a85c539d188551e0.tar.lz nixpkgs-088eead34aa975dbd76c36d9a85c539d188551e0.tar.xz nixpkgs-088eead34aa975dbd76c36d9a85c539d188551e0.tar.zst nixpkgs-088eead34aa975dbd76c36d9a85c539d188551e0.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 10 |
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a46d0b2039..2a00bd2615f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4132,6 +4132,8 @@ with pkgs; humioctl = callPackage ../applications/logging/humioctl {}; + huniq = callPackage ../tools/text/huniq { }; + hyprland = callPackage ../applications/window-managers/hyprland { wlroots = wlroots.overrideAttrs (_: { version = "unstable-2022-06-07"; @@ -10666,6 +10668,8 @@ with pkgs; rnp = callPackage ../tools/security/rnp { }; + rnr = callPackage ../tools/text/rnr { }; + rnv = callPackage ../tools/text/xml/rnv { }; rosie = callPackage ../tools/text/rosie { }; @@ -14146,6 +14150,8 @@ with pkgs; jwasm = callPackage ../development/compilers/jwasm { }; + kind2 = callPackage ../development/compilers/kind2 { }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; regenkfs = callPackage ../development/tools/knightos/regenkfs { }; @@ -17045,6 +17051,10 @@ with pkgs; privacyidea = callPackage ../applications/misc/privacyidea { }; + process-viewer = callPackage ../applications/misc/process-viewer { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; + }; + procodile = callPackage ../tools/system/procodile { }; pry = callPackage ../development/tools/pry { }; @@ -33325,8 +33335,7 @@ with pkgs; dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; - dxx-rebirth = callPackage ../games/dxx-rebirth - { stdenv = gcc10StdenvCompat; physfs = physfs_2; }; + dxx-rebirth = callPackage ../games/dxx-rebirth { }; inherit (callPackages ../games/dxx-rebirth/assets.nix { }) descent1-assets diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 156564dd371..d3320d4cf3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -307,6 +307,8 @@ in { aioextensions = callPackage ../development/python-modules/aioextensions { }; + aiofile = callPackage ../development/python-modules/aiofile { }; + aiofiles = callPackage ../development/python-modules/aiofiles { }; aioflo = callPackage ../development/python-modules/aioflo { }; @@ -375,6 +377,8 @@ in { aiolyric = callPackage ../development/python-modules/aiolyric { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; + aiomodernforms = callPackage ../development/python-modules/aiomodernforms { }; aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; @@ -1602,6 +1606,8 @@ in { inherit (self) python numpy boost; }); + caio = callPackage ../development/python-modules/caio { }; + cairo-lang = callPackage ../development/python-modules/cairo-lang { }; cairocffi = callPackage ../development/python-modules/cairocffi { }; @@ -5378,6 +5384,8 @@ in { logfury = callPackage ../development/python-modules/logfury { }; + logging-journald = callPackage ../development/python-modules/logging-journald { }; + logi-circle = callPackage ../development/python-modules/logi-circle { }; logical-unification = callPackage ../development/python-modules/logical-unification { }; @@ -10805,6 +10813,8 @@ in { temescal = callPackage ../development/python-modules/temescal { }; + temperusb = callPackage ../development/python-modules/temperusb { }; + tempest = callPackage ../development/python-modules/tempest { }; tempita = callPackage ../development/python-modules/tempita { }; |