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

Merge pull request #29440 from oxij/pkg/linuxPackages

Browse Source 
linuxPackages: various changes
This commit is contained in:
Graham Christensen 2018-02-09 20:36:46 -05:00 committed by GitHub
commit ad78e52357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix → pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
View File

35
pkgs/top-level/all-packages.nix
View File

@ -12890,16 +12890,12 @@ with pkgs;
]; ];
}; };
linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix { linux_copperhead = callPackage ../os-specific/linux/kernel/linux-copperhead-hardened.nix {
kernelPatches = with kernelPatches; [ kernelPatches = with kernelPatches; [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.tag_hardened kernelPatches.tag_hardened
]; ];
extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
inherit stdenv;
inherit (linux_hardened_copperhead) version;
};
}; };
# linux mptcp is based on the 4.4 kernel # linux mptcp is based on the 4.4 kernel
@ -13033,8 +13029,6 @@ with pkgs;
]; ];
}; };
linux_samus_latest = linux_samus_4_12;
/* Linux kernel modules are inherently tied to a specific kernel. So /* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages specific kernel, we have a function that builds those packages
@ -13186,7 +13180,6 @@ with pkgs;
# Build the kernel modules for the some of the kernels. # Build the kernel modules for the some of the kernels.
linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard; linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard;
linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead;
linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
@ -13209,22 +13202,36 @@ with pkgs;
linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs);
# Build a kernel for Xen dom0 # Build a kernel for Xen dom0
linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));
linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
# Hardened linux # Hardened linux
linux_hardened = let linux = pkgs.linuxPackages_latest.kernel; in linux.override { hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override {
extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
inherit stdenv; inherit stdenv;
inherit (linux) version; inherit (kernel) version;
}; };
}; });
linuxPackages_hardened = linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux);
recurseIntoAttrs (linuxPackagesFor linux_hardened); linux_hardened = linuxPackages_hardened.kernel;
linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest);
linux_latest_hardened = linuxPackages_latest_hardened.kernel;
linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));
linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead);
linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel;
linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility
# Samus kernels # Samus kernels
linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest); linuxPackages_samus_latest = linuxPackages_samus_4_12;
linux_samus_latest = linuxPackages_samus_latest.kernel;
# A function to build a manually-configured kernel # A function to build a manually-configured kernel
linuxManualConfig = pkgs.buildLinux; linuxManualConfig = pkgs.buildLinux;