From 7192c09b8aa2ce7e853012add785be4983599808 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 10 May 2024 19:33:11 +0200 Subject: [PATCH] linuxPackages.mm-tools: rename from vm-tools, add alias See https://lore.kernel.org/all/20230103180754.129637-4-sj@kernel.org --- pkgs/os-specific/linux/{vm-tools => mm-tools}/default.nix | 4 ++-- pkgs/top-level/linux-kernels.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/os-specific/linux/{vm-tools => mm-tools}/default.nix (84%) diff --git a/pkgs/os-specific/linux/vm-tools/default.nix b/pkgs/os-specific/linux/mm-tools/default.nix similarity index 84% rename from pkgs/os-specific/linux/vm-tools/default.nix rename to pkgs/os-specific/linux/mm-tools/default.nix index c5981bfc2713..38f16ca4e7d2 100644 --- a/pkgs/os-specific/linux/vm-tools/default.nix +++ b/pkgs/os-specific/linux/mm-tools/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, linux }: stdenv.mkDerivation { - pname = "vm-tools"; + pname = "mm-tools"; inherit (linux) version src; makeFlags = [ "sbindir=${placeholder "out"}/bin" ]; - preConfigure = "cd tools/vm"; + preConfigure = "cd tools/mm"; meta = with lib; { inherit (linux.meta) license platforms; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 91a8c2f53926..5094f8637ab5 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -538,7 +538,7 @@ in { virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - vm-tools = callPackage ../os-specific/linux/vm-tools { }; + mm-tools = callPackage ../os-specific/linux/mm-tools { }; vmm_clock = callPackage ../os-specific/linux/vmm_clock { }; @@ -587,6 +587,7 @@ in { hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14 + 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"; });