From f433d91bb3fae87f5232a8946965777802b16b59 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 21:15:48 +0200 Subject: [PATCH] anbox: drop kernel modules package All builds are broken: - 4.14 - 4.19 - 5.4 https://hydra.nixos.org/eval/1761072?filter=anbox&compare=1760998&full=#tabs-still-fail Let's just drop it. This leaves the anbox module possibly in a broken-ish state, but I'm not sure what to do about it. --- nixos/modules/virtualisation/anbox.nix | 3 -- pkgs/os-specific/linux/anbox/kmod.nix | 42 -------------------------- pkgs/top-level/linux-kernels.nix | 2 -- 3 files changed, 47 deletions(-) delete mode 100644 pkgs/os-specific/linux/anbox/kmod.nix diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix index a4da62eb5f7..c70da573533 100644 --- a/nixos/modules/virtualisation/anbox.nix +++ b/nixos/modules/virtualisation/anbox.nix @@ -73,9 +73,6 @@ in environment.systemPackages = with pkgs; [ anbox ]; - boot.kernelModules = [ "ashmem_linux" "binder_linux" ]; - boot.extraModulePackages = [ kernelPackages.anbox ]; - services.udev.extraRules = '' KERNEL=="ashmem", NAME="%k", MODE="0666" KERNEL=="binder*", NAME="%k", MODE="0666" diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix deleted file mode 100644 index 553712d21a7..00000000000 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, kernel, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "anbox-modules"; - version = "2020-06-14-${kernel.version}"; - - src = fetchFromGitHub { - owner = "anbox"; - repo = "anbox-modules"; - rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086"; - sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0="; - }; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - KERNEL_SRC="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - - buildPhase = '' - for d in ashmem binder;do - cd $d - make - cd - - done - ''; - - installPhase = '' - modDir=$out/lib/modules/${kernel.modDirVersion}/kernel/updates/ - mkdir -p $modDir - for d in ashmem binder;do - mv $d/$d*.ko $modDir/. - done - ''; - - meta = with lib; { - description = "Anbox ashmem and binder drivers."; - homepage = "https://github.com/anbox/anbox-modules"; - license = licenses.gpl2Only; - platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.5"; - maintainers = with maintainers; [ edwtjo ]; - }; -} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 454e1cdca76..7c892035e7f 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -271,8 +271,6 @@ in { }); }; - anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; - apfs = callPackage ../os-specific/linux/apfs { }; batman_adv = callPackage ../os-specific/linux/batman-adv {};