diff options
| author | Kiskae <Kiskae@users.noreply.github.com> | 2023-09-11 12:25:02 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 07:45:33 +0000 |
| commit | 813e00074293f74e12800982b9025c5cdf25f08b (patch) | |
| tree | cba5931edf0c2aa436a272e09d69ebdfff000988 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | 55ec5ae7d6c3f7866a0696a6ccfb66a1665b3d72 (diff) | |
| download | nixpkgs-813e00074293f74e12800982b9025c5cdf25f08b.tar nixpkgs-813e00074293f74e12800982b9025c5cdf25f08b.tar.gz nixpkgs-813e00074293f74e12800982b9025c5cdf25f08b.tar.bz2 nixpkgs-813e00074293f74e12800982b9025c5cdf25f08b.tar.lz nixpkgs-813e00074293f74e12800982b9025c5cdf25f08b.tar.xz nixpkgs-813e00074293f74e12800982b9025c5cdf25f08b.tar.zst nixpkgs-813e00074293f74e12800982b9025c5cdf25f08b.zip | |
linux_testing: 6.5-rc7 -> 6.6-rc1
rc1: https://lwn.net/Articles/944122/
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8dd92c99db4..7c3084d7ebd 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole +, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod , fetchpatch }: @@ -271,7 +271,7 @@ let make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" unlink $out/lib/modules/${modDirVersion}/build - unlink $out/lib/modules/${modDirVersion}/source + rm -f $out/lib/modules/${modDirVersion}/source mkdir -p $dev/lib/modules/${modDirVersion}/{build,source} @@ -376,6 +376,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optional (lib.versionAtLeast version "5.8") elfutils + ++ optional (lib.versionAtLeast version "6.6") kmod ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; |