Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

system76-power & system76-scheduler: pkgs.linuxPackages -> pkgs #342921

Merged
merged 4 commits into from
Oct 17, 2024
Merged

system76-power & system76-scheduler: pkgs.linuxPackages -> pkgs #342921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6edeaa7
system76-power: Move out of kernel category
sjmonson May 8, 2024
c419b71
system76-scheduler: Move out of kernel category
sjmonson May 8, 2024
85fb7b9
system76-scheduler: migrate to pkgs/by-name format
sjmonson Sep 19, 2024
8386ef9
system76-power: migrate to pkgs/by-name format
sjmonson Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/hardware/system-76.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ let
};
};

power-pkg = config.boot.kernelPackages.system76-power;
power-pkg = pkgs.system76-power;
powerConfig = mkIf cfg.power-daemon.enable {
# Make system76-power usable by root from the command line.
environment.systemPackages = [ power-pkg ];
Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/services/desktops/system76-scheduler.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
};

Expand Down Expand Up @@ -252,7 +252,7 @@ in {
# No custom settings: just use stock configuration with a fix for Pipewire
"system76-scheduler/config.kdl".source = "${cfg.package}/data/config.kdl";
"system76-scheduler/process-scheduler/00-dist.kdl".source = "${cfg.package}/data/pop_os.kdl";
"system76-scheduler/process-scheduler/01-fix-pipewire-paths.kdl".source = ../../../../pkgs/os-specific/linux/system76-scheduler/01-fix-pipewire-paths.kdl;
"system76-scheduler/process-scheduler/01-fix-pipewire-paths.kdl".source = ../../../../pkgs/by-name/sy/system76-scheduler/01-fix-pipewire-paths.kdl;
})

(let
Expand Down
0 ...specific/linux/system76-power/default.nix → pkgs/by-name/sy/system76-power/package.nix
View file
Open in desktop
File renamed without changes.
0 ...tem76-scheduler/01-fix-pipewire-paths.kdl → ...tem76-scheduler/01-fix-pipewire-paths.kdl
View file
Open in desktop
File renamed without changes.
0 ...ific/linux/system76-scheduler/default.nix → ...by-name/sy/system76-scheduler/package.nix
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions pkgs/top-level/linux-kernels.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,12 +532,8 @@ in {

system76-acpi = callPackage ../os-specific/linux/system76-acpi { };

system76-power = callPackage ../os-specific/linux/system76-power { };

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 { };
Expand Down Expand Up @@ -624,6 +620,8 @@ in {
xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
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);
Expand Down