From ee6a0e376d4e6cb4d8c980eedff78cceeef18a1e Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 8 Jul 2024 18:55:38 +0200
Subject: [PATCH] kvdo: drop

---
 .../manual/release-notes/rl-2411.section.md   |  2 ++
 nixos/modules/tasks/lvm.nix                   |  3 +-
 pkgs/os-specific/linux/kvdo/default.nix       | 35 -------------------
 pkgs/os-specific/linux/vdo/default.nix        |  2 +-
 pkgs/top-level/linux-kernels.nix              |  3 +-
 5 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kvdo/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 6b380c5023d4..bff4f1eac74f 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/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
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 9607218ec069..438b46f8f9b0 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/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
diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix
deleted file mode 100644
index cc5ace339b42..000000000000
--- a/pkgs/os-specific/linux/kvdo/default.nix
+++ /dev/null
@@ -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";
-  };
-}
diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix
index e709b26ad93d..548caf7a5b6e 100644
--- a/pkgs/os-specific/linux/vdo/default.nix
+++ b/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";
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index d5bd0f19bac2..027374fd490e 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/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);