diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-26 18:01:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 18:01:32 +0000 |
| commit | 1071ab374f0a3b0d8022fb92a92f24d921fcee9d (patch) | |
| tree | 4e5d71dd6e8c03014a5c02c14e3c044f540b6a9f /pkgs/top-level | |
| parent | 6cdce414a9dce1693d4adbfc86f95c3b1e8d5886 (diff) | |
| parent | 41400115e0833821ae0302080338e3a69775996d (diff) | |
| download | nixpkgs-1071ab374f0a3b0d8022fb92a92f24d921fcee9d.tar nixpkgs-1071ab374f0a3b0d8022fb92a92f24d921fcee9d.tar.gz nixpkgs-1071ab374f0a3b0d8022fb92a92f24d921fcee9d.tar.bz2 nixpkgs-1071ab374f0a3b0d8022fb92a92f24d921fcee9d.tar.lz nixpkgs-1071ab374f0a3b0d8022fb92a92f24d921fcee9d.tar.xz nixpkgs-1071ab374f0a3b0d8022fb92a92f24d921fcee9d.tar.zst nixpkgs-1071ab374f0a3b0d8022fb92a92f24d921fcee9d.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 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d852668b36..5bc0fcf1047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9703,7 +9703,10 @@ with pkgs; plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = callPackage ../tools/system/plan9port { }; + plan9port = callPackage ../tools/system/plan9port { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; + inherit (darwin) DarwinTools; + }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; @@ -27858,6 +27861,10 @@ with pkgs; tiramisu = callPackage ../applications/misc/tiramisu { }; + rlaunch = callPackage ../applications/misc/rlaunch { + inherit (xorg) libX11 libXft libXinerama; + }; + rootbar = callPackage ../applications/misc/rootbar {}; waybar = callPackage ../applications/misc/waybar {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 56be9add0ba..038045e0be9 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -501,6 +501,8 @@ in { qc71_laptop = callPackage ../os-specific/linux/qc71_laptop { }; + hid-ite8291r3 = callPackage ../os-specific/linux/hid-ite8291r3 { }; + } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; }); |