From ec3c2b54a956ffb174da74b4a9c4c20e2a838354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 23 Aug 2023 14:54:50 +0200 Subject: [PATCH] hosts/arael: kernel patch for GPL kernel_neon_ APIs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/jakubgs/nixos-nanopi-r6c/issues/1 https://github.com/Mic92/nixpkgs/commit/fb89d2bb0130116096ef3438295c0b105ca4b59f https://github.com/openzfs/zfs/issues/14555 Signed-off-by: Jakub SokoĊ‚owski --- hosts/arael/kernel_vanilla_6_3.nix | 2 ++ hosts/arael/sd-image.nix | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hosts/arael/kernel_vanilla_6_3.nix b/hosts/arael/kernel_vanilla_6_3.nix index 152e23c2..3dc1d0c5 100644 --- a/hosts/arael/kernel_vanilla_6_3.nix +++ b/hosts/arael/kernel_vanilla_6_3.nix @@ -17,5 +17,7 @@ buildLinux (args // rec { kernelPatches = [ { name = "nanopi_r6s_rk3588s"; patch = ./nanopi_r6s_rk3588s.patch; } + { name = "export_neon_symbols_as_gpl"; + patch = ./export_neon_symbols_as_gpl.patch; } ]; } // (args.argsOverride or { })) diff --git a/hosts/arael/sd-image.nix b/hosts/arael/sd-image.nix index a00622ad..d34de5c9 100644 --- a/hosts/arael/sd-image.nix +++ b/hosts/arael/sd-image.nix @@ -39,11 +39,6 @@ in { services.sshd.enable = true; networking.firewall.enable = false; - # ZFS "GPL-incompatible module" fix: - # https://github.com/NixOS/nixpkgs/pull/237875 - # https://github.com/openzfs/zfs/issues/14555 - boot.zfs.removeLinuxDRM = true; - # root autologin etc users.users.root.password = "root"; services.openssh.settings.PermitRootLogin = lib.mkDefault "yes";