kvdo: drop

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -262,6 +262,8 @@
 
 - PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value.
 
+- The `kvdo` kernel module package was removed, because it was upstreamed in kernel version 6.9, where it is called `dm-vdo`.
+
 - `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details.
 
 - `gitlab` deprecated support for *runner registration tokens* in GitLab 16.0, disabled their support in GitLab 17.0 and will

nixos/modules/tasks/lvm.nix

@@ -89,7 +89,7 @@ in {
     (mkIf cfg.boot.vdo.enable {
       boot = {
         initrd = {
-          kernelModules = [ "kvdo" ];
+          kernelModules = [ "dm-vdo" ];
 
           systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.vdo ];
 
@@ -107,7 +107,6 @@ in {
             done
           '';
         };
-        extraModulePackages = [ config.boot.kernelPackages.kvdo ];
       };
 
       services.lvm.package = mkOverride 999 pkgs.lvm2_vdo;  # this overrides mkDefault

pkgs/os-specific/linux/kvdo/default.nix

@@ -1,35 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, vdo, kernel }:
-
-stdenv.mkDerivation rec {
-  inherit (vdo);
-  pname = "kvdo";
-  version = "8.2.3.3"; # bump this version with vdo
-
-  src = fetchFromGitHub {
-    owner = "dm-vdo";
-    repo = "kvdo";
-    rev = version;
-    hash = "sha256-y7uVgWFV6uWRoRqfiu0arG9731mgWijXjcp9KSaZ5X0=";
-  };
-
-  nativeBuildInputs = kernel.moduleBuildDependencies;
-
-  dontConfigure = true;
-  enableParallelBuilding = true;
-
-  KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-  INSTALL_MOD_PATH = placeholder "out";
-
-  preBuild = ''
-    makeFlags="$makeFlags -C ${KSRC} M=$(pwd)"
-  '';
-  installTargets = [ "modules_install" ];
-
-  meta = with lib; {
-    inherit (vdo.meta) license maintainers;
-    homepage = "https://github.com/dm-vdo/kvdo";
-    description = "Pair of kernel modules which provide pools of deduplicated and/or compressed block storage";
-    platforms = platforms.linux;
-    broken = kernel.kernelOlder "5.17";
-  };
-}

pkgs/os-specific/linux/vdo/default.nix

@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vdo";
-  version = "8.2.2.2";  # bump this version with kvdo
+  version = "8.2.2.2";
 
   src = fetchFromGitHub {
     owner = "dm-vdo";

pkgs/top-level/linux-kernels.nix

@@ -389,8 +389,6 @@ in {
 
     ena = callPackage ../os-specific/linux/ena {};
 
-    kvdo = callPackage ../os-specific/linux/kvdo {};
-
     lenovo-legion-module = callPackage ../os-specific/linux/lenovo-legion { };
 
     linux-gpib = callPackage ../applications/science/electronics/linux-gpib/kernel.nix { };
@@ -613,6 +611,7 @@ in {
     vm-tools = self.mm-tools;
     xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
     amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16
+    kvdo = throw "kvdo was removed, because it was added to mainline in kernel version 6.9"; # Added 2024-07-08
   });
 
   hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);