colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Franz Pletz 2024-05-13 00:29:03 +02:00 committed by GitHub
commit 6e8d6c46bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

3
pkgs/top-level/linux-kernels.nix
View File

@ -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";
});