diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b3e0562793d72..dae9c14bad0b7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18091,6 +18091,12 @@ githubId = 15896005; name = "Vladyslav Burzakovskyy"; }; + mrobbetts = { + email = "mrobbetts@gmail.com"; + github = "mrobbetts"; + githubId = 1067896; + name = "Matthew Robbetts"; + }; MrSom3body = { email = "nix@sndh.dev"; matrix = "@mrsom3body:matrix.org"; diff --git a/pkgs/os-specific/linux/ravenna-alsa-lkm-bondagit/default.nix b/pkgs/os-specific/linux/ravenna-alsa-lkm-bondagit/default.nix new file mode 100644 index 0000000000000..5659e22a27412 --- /dev/null +++ b/pkgs/os-specific/linux/ravenna-alsa-lkm-bondagit/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "ravenna-alsa-lkm_${version}_${kernel.version}"; + + version = "1.14+"; + + src = fetchFromGitHub { + owner = "bondagit"; + repo = "ravenna-alsa-lkm"; +/* + # 1.14. Works nicely with linux-6.14 + #rev = "7e3b67f35f7733fc7abc0bba53450ef9ca66785e"; + #sha256 = "sha256-iYZLnBsNLMwNlPk9lC0UUHoGyaPwqfN8z6nAGTMfpYA="; +*/ + # Include fixes for linux-6.15 + rev = "e1ecd6a3f998396ee3066c3ff8fa4f246a560144"; + hash = "sha256-VF19IviTPAIL+7sHKSkPRvxpE/aPPc0XJ4XcpMz5Efw="; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + enableParallelBuilding = true; + + configurePhase = '' + cd driver + substituteInPlace ./Makefile --replace "/lib/modules" "${kernel.dev}/lib/modules" + ''; + + installPhase = '' + runHook preInstall + install --verbose --mode=644 -D --target-directory="$out/lib/modules/${kernel.modDirVersion}/kernel/sound/drivers/ravenna" MergingRavennaALSA.ko + runHook postInstall + ''; + + meta = { + description = + "Merging Technologies' ALSA driver implementation of Ravenna and AES67, with additional work by bondagit"; + homepage = "https://github.com/bondagit/ravenna-alsa-lkm"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.mrobbetts ]; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 26ef441980e61..14f5a7ca89ed1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -513,6 +513,8 @@ in r8168 = callPackage ../os-specific/linux/r8168 { }; + ravenna-alsa-lkm-bondagit = callPackage ../os-specific/linux/ravenna-alsa-lkm-bondagit { }; + rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { }; rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { };