From 94fc9597d52e73e8fb77845f063dd895defb23fe Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 19 Mar 2026 11:05:07 +1000 Subject: [PATCH] linux_libre: remove cruft follow up from https://github.com/NixOS/nixpkgs/commit/545a975d7e225d6315080aee7e82cee5a133fb51 --- nixos/tests/kernel-generic/default.nix | 1 - pkgs/os-specific/linux/amdgpu-i2c/default.nix | 2 +- pkgs/os-specific/linux/kernel/build.nix | 2 -- pkgs/os-specific/linux/kernel/generic.nix | 2 -- pkgs/top-level/linux-kernels.nix | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/tests/kernel-generic/default.nix b/nixos/tests/kernel-generic/default.nix index fe0907d6d32c..912c32054381 100644 --- a/nixos/tests/kernel-generic/default.nix +++ b/nixos/tests/kernel-generic/default.nix @@ -84,7 +84,6 @@ let linux_rt_5_15 linux_rt_6_1 linux_rt_6_6 - linux_libre linux_testing ; diff --git a/pkgs/os-specific/linux/amdgpu-i2c/default.nix b/pkgs/os-specific/linux/amdgpu-i2c/default.nix index e8457bde06be..f8dff5e02708 100644 --- a/pkgs/os-specific/linux/amdgpu-i2c/default.nix +++ b/pkgs/os-specific/linux/amdgpu-i2c/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { homepage = "https://github.com/twifty/amd-gpu-i2c"; downloadPage = "https://github.com/twifty/amd-gpu-i2c"; description = "Exposes i2c interface to set colors on AMD GPUs"; - broken = kernel.kernelOlder "6.1.0" || kernel.isLibre; + broken = kernel.kernelOlder "6.1.0"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thardin ]; diff --git a/pkgs/os-specific/linux/kernel/build.nix b/pkgs/os-specific/linux/kernel/build.nix index 72e9bd7372fd..e1d7fb5b7901 100644 --- a/pkgs/os-specific/linux/kernel/build.nix +++ b/pkgs/os-specific/linux/kernel/build.nix @@ -77,7 +77,6 @@ lib.makeOverridable ( # for module compatibility isZen ? false, - isLibre ? false, isHardened ? false, # Whether to utilize the controversial import-from-derivation feature to parse the config @@ -526,7 +525,6 @@ lib.makeOverridable ( inherit isZen isHardened - isLibre withRust ; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 65ba04438ff8..9d4c4f19f1c5 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -75,7 +75,6 @@ lib.makeOverridable ( isLTS ? false, isZen ? false, - isLibre ? false, isHardened ? false, # easy overrides to stdenv.hostPlatform.linux-kernel members @@ -317,7 +316,6 @@ lib.makeOverridable ( isLTS isZen isHardened - isLibre ; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 757d7ebb8dfa..68824bbc5eb8 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -329,7 +329,6 @@ in isLTS isZen isHardened - isLibre ; inherit (kernel) kernelOlder kernelAtLeast; kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [