From 1d4df7adcc918f23c9c8fb357dd3bb7861270fed Mon Sep 17 00:00:00 2001 From: scrufulufugus Date: Tue, 7 May 2024 17:17:09 -0700 Subject: [PATCH] system76-scheduler: Move out of kernel category system76-scheduler: add alias at old location --- nixos/modules/services/desktops/system76-scheduler.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/desktops/system76-scheduler.nix b/nixos/modules/services/desktops/system76-scheduler.nix index b021ae6bfbfa..436fc5b14bd2 100644 --- a/nixos/modules/services/desktops/system76-scheduler.nix +++ b/nixos/modules/services/desktops/system76-scheduler.nix @@ -95,8 +95,8 @@ in { package = mkOption { type = types.package; - default = config.boot.kernelPackages.system76-scheduler; - defaultText = literalExpression "config.boot.kernelPackages.system76-scheduler"; + default = pkgs.system76-scheduler; + defaultText = literalExpression "pkgs.system76-scheduler"; description = "Which System76-Scheduler package to use."; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64783c112094..36414b3f18fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26055,6 +26055,8 @@ with pkgs; system76-power = callPackage ../os-specific/linux/system76-power { }; + system76-scheduler = callPackage ../os-specific/linux/system76-scheduler { }; + ocf-resource-agents = callPackage ../os-specific/linux/ocf-resource-agents { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c65da47b7b65..8099591d0c6a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -518,8 +518,6 @@ in { system76-io = callPackage ../os-specific/linux/system76-io { }; - system76-scheduler = callPackage ../os-specific/linux/system76-scheduler { }; - tmon = callPackage ../os-specific/linux/tmon { }; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; @@ -609,6 +607,7 @@ in { amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16 kvdo = throw "kvdo was removed, because it was added to mainline in kernel version 6.9"; # Added 2024-07-08 system76-power = lib.warn "kernelPackages.system76-power is now pkgs.system76-power" pkgs.system76-power; # Added 2024-10-16 + system76-scheduler = lib.warn "kernelPackages.system76-scheduler is now pkgs.system76-scheduler" pkgs.system76-scheduler; # Added 2024-10-16 }); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);