From d9fd4ba73348f702d38c477fa0fd7eaf88015cbe Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Sat, 8 Jul 2023 12:52:38 +0200
Subject: [PATCH] hid-nintendo: remove

---
 nixos/modules/services/hardware/joycond.nix   |  3 --
 .../linux/hid-nintendo/default.nix            | 42 -------------------
 pkgs/top-level/linux-kernels.nix              |  2 +-
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/hid-nintendo/default.nix

diff --git a/nixos/modules/services/hardware/joycond.nix b/nixos/modules/services/hardware/joycond.nix
index 1af18b3b63d..df3239cb2a7 100644
--- a/nixos/modules/services/hardware/joycond.nix
+++ b/nixos/modules/services/hardware/joycond.nix
@@ -2,7 +2,6 @@
 
 let
   cfg = config.services.joycond;
-  kernelPackages = config.boot.kernelPackages;
 in
 
 with lib;
@@ -24,8 +23,6 @@ with lib;
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
 
-    boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo;
-
     services.udev.packages = [ cfg.package ];
 
     systemd.packages = [ cfg.package ];
diff --git a/pkgs/os-specific/linux/hid-nintendo/default.nix b/pkgs/os-specific/linux/hid-nintendo/default.nix
deleted file mode 100644
index 7b8c73fc0cc..00000000000
--- a/pkgs/os-specific/linux/hid-nintendo/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, kernel
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "hid-nintendo";
-  version = "3.2";
-
-  src = fetchFromGitHub {
-    owner = "nicman23";
-    repo = "dkms-hid-nintendo";
-    rev = finalAttrs.version;
-    hash = "sha256-2a+95zwyhJsF/KSo/Pm/JZ7ktDG02UZjsixSnVUXRrA=";
-  };
-
-  setSourceRoot = ''
-    export sourceRoot=$(pwd)/source/src
-  '';
-
-  nativeBuildInputs = kernel.moduleBuildDependencies;
-
-  makeFlags = kernel.makeFlags ++ [
-    "-C"
-    "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    "M=$(sourceRoot)"
-  ];
-
-  buildFlags = [ "modules" ];
-  installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
-  installTargets = [ "modules_install" ];
-
-  meta = {
-    homepage = "https://github.com/nicman23/dkms-hid-nintendo";
-    description = "A Nintendo HID kernel module";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-    broken = lib.versionOlder kernel.version "4.14";
-  };
-})
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 8a87f955480..bc6a5a7e35d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -354,7 +354,6 @@ in {
     fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { };
 
     gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { };
-    hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { };
 
     hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
 
@@ -563,6 +562,7 @@ in {
 
   } // lib.optionalAttrs config.allowAliases {
     ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
+    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
     xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";