From 96d7a8de5f023fd5fda310703d4ee03b1c22f3cd Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Wed, 14 Jun 2023 18:30:25 +0200 Subject: [PATCH] sch_cake: remove --- pkgs/os-specific/linux/sch_cake/default.nix | 34 --------------------- pkgs/top-level/linux-kernels.nix | 3 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/os-specific/linux/sch_cake/default.nix diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix deleted file mode 100644 index f93713344efb..000000000000 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: - -stdenv.mkDerivation { - pname = "sch_cake"; - version = "unstable-2017-07-16"; - - src = fetchFromGitHub { - owner = "dtaht"; - repo = "sch_cake"; - rev = "e641a56f27b6848736028f87eda65ac3df9f99f7"; - sha256 = "08582jy01j32b3mj8hf6m8687qrcz64zv2m236j24inlkmd94q21"; - }; - - hardeningDisable = [ "pic" ]; - - makeFlags = [ - "KERNEL_VERSION=${kernel.version}" - "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - installPhase = '' - install -v -m 644 -D sch_cake.ko \ - $out/lib/modules/${kernel.modDirVersion}/kernel/net/sched/sch_cake.ko - ''; - - meta = with lib; { - description = "The cake qdisc scheduler"; - homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/"; - license = with licenses; [ bsd3 gpl2 ]; - maintainers = with maintainers; [ fpletz ]; - platforms = platforms.linux; - broken = lib.versionAtLeast kernel.version "4.13"; - }; -} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 18967e28651a..fc6f2288349a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -482,8 +482,6 @@ in { prl-tools = callPackage ../os-specific/linux/prl-tools { }; - sch_cake = callPackage ../os-specific/linux/sch_cake { }; - isgx = callPackage ../os-specific/linux/isgx { }; rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { }; @@ -563,6 +561,7 @@ in { } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; + sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; });