From 8687bf7e9c2aa523d11fccd3a731a452a34a9315 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 28 Jul 2022 17:10:47 +0700 Subject: [PATCH] linuxPackages*.xmm7360-pci: drop Support for 7360 got enabled via iosm in mainline kernel: https://github.com/torvalds/linux/commit/1f52d7b622854b8bd7a1be3de095ca2e1f77098e There's few reason to still ship this out-of-tree kernel module, which broke whenever the laptop was suspended anyways. --- .../os-specific/linux/xmm7360-pci/default.nix | 31 ------------------- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/os-specific/linux/xmm7360-pci/default.nix diff --git a/pkgs/os-specific/linux/xmm7360-pci/default.nix b/pkgs/os-specific/linux/xmm7360-pci/default.nix deleted file mode 100644 index 435ff94afb76..000000000000 --- a/pkgs/os-specific/linux/xmm7360-pci/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, perl, bc, breakpointHook }: - -stdenv.mkDerivation rec { - pname = "xmm7360-pci"; - version = "unstable-2021-07-19"; - - src = fetchFromGitHub { - owner = "xmm7360"; - repo = "xmm7360-pci"; - rev = "7086b80bb609180b1b89fb478751e5e8414ab64f"; - sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c"; - }; - - makeFlags = kernel.makeFlags ++ [ - "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=${placeholder "out"}" - ]; - - nativeBuildInputs = kernel.moduleBuildDependencies; - installFlags = [ "DEPMOD=true" ]; - - meta = with lib; { - homepage = "https://github.com/xmm7360/xmm7360-pci"; - description = "PCI driver for Fibocom L850-GL modem based on Intel XMM7360 modem"; - downloadPage = "https://github.com/xmm7360/xmm7360-pci"; - license = licenses.isc; - maintainers = with maintainers; [ flokli hexa ]; - platforms = platforms.linux; - broken = kernel.kernelOlder "4.10" || kernel.kernelAtLeast "5.14"; - }; -} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5f0463572e3e..3c863e637fcd 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -483,7 +483,7 @@ in { x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; - xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; + xmm7360-pci = throw "Support for 7360 was added to the iosm mainline kernel module"; xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null;