Unverified Commit 6e8d6c46 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #310648 from WilliButz/rename/mm-tools

parents 7b32ae4b 7192c09b

pkgs/os-specific/linux/vm-tools/default.nix→pkgs/os-specific/linux/mm-tools/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/linux-kernels.nix

+2 −1
Original line number Diff line number Diff line
@@ -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";

  });