From 8e0b66120d7fd29ebb707bf8d84c7a73d6a2932e Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 14 May 2023 11:08:23 +0200 Subject: [PATCH 1/3] kvdo: add missing kernel.moduleBuildDependencies --- pkgs/os-specific/linux/kvdo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix index 7e7c765bd819..da1eadd594d4 100644 --- a/pkgs/os-specific/linux/kvdo/default.nix +++ b/pkgs/os-specific/linux/kvdo/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { hash = "sha256-4FYTFUIvGjea3bh2GbQYG7hSswVDdNS3S+jWQ9+inpg="; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + dontConfigure = true; enableParallelBuilding = true; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { preBuild = '' makeFlags="$makeFlags -C ${KSRC} M=$(pwd)" -''; + ''; installTargets = [ "modules_install" ]; meta = with lib; { From 343834d6fd55eb470d9ce6c1dff3d5dbdf5bfc29 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 14 May 2023 11:24:26 +0200 Subject: [PATCH 2/3] kvdo: 8.2.0.2 -> 8.2.1.6 --- pkgs/os-specific/linux/kvdo/default.nix | 5 +++-- pkgs/os-specific/linux/vdo/default.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix index da1eadd594d4..219bc9db1fb2 100644 --- a/pkgs/os-specific/linux/kvdo/default.nix +++ b/pkgs/os-specific/linux/kvdo/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, fetchFromGitHub, vdo, kernel }: stdenv.mkDerivation rec { - inherit (vdo) version; + inherit (vdo); pname = "kvdo"; + version = "8.2.1.6"; # bump this version with vdo src = fetchFromGitHub { owner = "dm-vdo"; repo = "kvdo"; rev = version; - hash = "sha256-4FYTFUIvGjea3bh2GbQYG7hSswVDdNS3S+jWQ9+inpg="; + hash = "sha256-S5r2Rgx5pWk4IsdIwmfZkuGL/oEQ3prquyVqxjR3cO0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index d9033e65876b..ec953d25ec1f 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.0.2"; # kvdo uses this! + version = "8.2.0.2"; # bump this version with kvdo src = fetchFromGitHub { owner = "dm-vdo"; From 86e11e5924c2f9ac7ed4e00b0bdfea6421836269 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 14 May 2023 11:30:56 +0200 Subject: [PATCH 3/3] kvdo: no longer broken on kernel 5.17+ --- pkgs/os-specific/linux/kvdo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix index 219bc9db1fb2..e2390b68a5ca 100644 --- a/pkgs/os-specific/linux/kvdo/default.nix +++ b/pkgs/os-specific/linux/kvdo/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dm-vdo/kvdo"; description = "A pair of kernel modules which provide pools of deduplicated and/or compressed block storage"; platforms = platforms.linux; - broken = kernel.kernelOlder "5.15" || kernel.kernelAtLeast "5.17"; + broken = kernel.kernelOlder "5.15"; }; }