From af5916dc6590cccb97bb22ca8f1c5098958779a5 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 8 Feb 2025 14:04:01 +0100 Subject: [PATCH 1/3] linuxPackages.rtl8821ce: unstable-2024-03-26 -> unstable-2025-02-08 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index d3ceefef0027..1f43c8720b54 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2024-03-26"; + version = "${kernel.version}-unstable-2025-02-08"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "f119398d868b1a3395f40c1df2e08b57b2c882cd"; - hash = "sha256-EfpKa5ZRBVM5T8EVim3cVX1PP1UM9CyG6tN5Br8zYww="; + rev = "46d1a59e37364ed4aedcb09746f0ae412e6b2066"; + hash = "sha256-vQM7e8tuy4Lf2HvGtHUvOxulF4DIhX33vFel9u9i178="; }; hardeningDisable = [ "pic" ]; From 6735c477a022c35681c233dfab8b80a6c3d9821d Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 8 Feb 2025 14:18:45 +0100 Subject: [PATCH 2/3] linuxPackages.rtl8821ce: refactor --- pkgs/os-specific/linux/rtl8821ce/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 1f43c8720b54..f71b76d297ca 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { prePatch = '' substituteInPlace ./Makefile \ - --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace /sbin/depmod \# \ - --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + --replace-fail /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace-fail /sbin/depmod \# \ + --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; preInstall = '' From 686d5b17e4a8ef56317eeb0011ea10ab5d78b387 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 15 Feb 2025 18:27:29 +0100 Subject: [PATCH 3/3] linuxPackages.rtl8821ce: remove hhm from maintainers due to several years of inactivity --- pkgs/os-specific/linux/rtl8821ce/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index f71b76d297ca..fd4eb273f613 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -41,10 +41,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - hhm - defelo - ]; + maintainers = with lib.maintainers; [ defelo ]; broken = stdenv.hostPlatform.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened);