From 969102bd1172bb00b0e0b694356ccdaa9224ada8 Mon Sep 17 00:00:00 2001 From: scrufulufugus Date: Wed, 18 Sep 2024 21:58:12 -0400 Subject: [PATCH] system76-scheduler: migrate to pkgs/by-name format --- nixos/modules/services/desktops/system76-scheduler.nix | 2 +- .../sy}/system76-scheduler/01-fix-pipewire-paths.kdl | 0 .../default.nix => by-name/sy/system76-scheduler/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{os-specific/linux => by-name/sy}/system76-scheduler/01-fix-pipewire-paths.kdl (100%) rename pkgs/{os-specific/linux/system76-scheduler/default.nix => by-name/sy/system76-scheduler/package.nix} (100%) diff --git a/nixos/modules/services/desktops/system76-scheduler.nix b/nixos/modules/services/desktops/system76-scheduler.nix index 436fc5b14bd2..b8f80276ef76 100644 --- a/nixos/modules/services/desktops/system76-scheduler.nix +++ b/nixos/modules/services/desktops/system76-scheduler.nix @@ -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 diff --git a/pkgs/os-specific/linux/system76-scheduler/01-fix-pipewire-paths.kdl b/pkgs/by-name/sy/system76-scheduler/01-fix-pipewire-paths.kdl similarity index 100% rename from pkgs/os-specific/linux/system76-scheduler/01-fix-pipewire-paths.kdl rename to pkgs/by-name/sy/system76-scheduler/01-fix-pipewire-paths.kdl diff --git a/pkgs/os-specific/linux/system76-scheduler/default.nix b/pkgs/by-name/sy/system76-scheduler/package.nix similarity index 100% rename from pkgs/os-specific/linux/system76-scheduler/default.nix rename to pkgs/by-name/sy/system76-scheduler/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36414b3f18fa..64783c112094 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26055,8 +26055,6 @@ 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; };