public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-12 06:21:36 +00:00
committed by GitHub
parent d63b57ef34 d8fb37f470
commit e2cf474986
27 changed files with 2617 additions and 2768 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+13 -2
View File
@@ -6598,8 +6598,9 @@ in
mandoc = callPackage ../tools/misc/mandoc { };
mangohud = callPackage ../tools/graphics/mangohud/combined.nix {
mangohud = callPackage ../tools/graphics/mangohud {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
mangohud32 = pkgsi686Linux.mangohud;
};
manix = callPackage ../tools/nix/manix {
@@ -20183,6 +20184,13 @@ in
];
};
linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -20487,6 +20495,7 @@ in
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11);
linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
# When adding to the list above:
# - Update linuxPackages_latest to the latest version
@@ -31393,7 +31402,9 @@ in
treefmt = callPackage ../development/tools/treefmt { };
bottom = callPackage ../tools/system/bottom {};
bottom = callPackage ../tools/system/bottom {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;
};
cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { };