Skip to content

Commit

Permalink
scx_git: init; scx: remove
Browse files Browse the repository at this point in the history
Everything at this moment builds
Add rusty to overlays.nix and scx-git/full.nix once PR on nixpkgs is available in unstable
Rename scx.csheds -> scx.cscheds once PR on nixpkgs is available in unstable
  • Loading branch information
JohnRTitor committed Nov 1, 2024
1 parent b97628e commit 7743005
Show file tree
Hide file tree
Showing 30 changed files with 2,248 additions and 997 deletions.
23 changes: 12 additions & 11 deletions overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ let
makeMicroarchPkgs = import ../shared/make-microarch.nix { inherit nixpkgs final selfOverlay nixpkgsExtraConfig; };

# Common stuff for scx-schedulers
scx-common = final.callPackage ../pkgs/scx/common.nix { };
scx-common = final.callPackage ../pkgs/scx-git/common.nix { };

# Required for 32-bit packages
has32 = final.stdenv.hostPlatform.isLinux && final.stdenv.hostPlatform.isx86;
Expand Down Expand Up @@ -251,16 +251,17 @@ in

spirv-headers_git = callOverride ../pkgs/spirv-headers-git { };

scx = final.callPackage ../pkgs/scx {
inherit scx-common;
scx-bpfland = final.callPackage ../pkgs/scx/bpfland { inherit scx-common; };
scx-lavd = final.callPackage ../pkgs/scx/lavd { inherit scx-common; };
scx-layered = final.callPackage ../pkgs/scx/layered { inherit scx-common; };
scx-mitosis = final.callPackage ../pkgs/scx/mitosis { inherit scx-common; };
scx-rlfifo = final.callPackage ../pkgs/scx/rlfifo { inherit scx-common; };
scx-rustland = final.callPackage ../pkgs/scx/rustland { inherit scx-common; };
scx-rusty = final.callPackage ../pkgs/scx/rusty { inherit scx-common; };
scx-stats = final.callPackage ../pkgs/scx/stats { inherit scx-common; };
scx_git = {
bpfland = final.callPackage ../pkgs/scx-git/bpfland { inherit scx-common; };
cscheds = final.callPackage ../pkgs/scx-git/cscheds.nix { inherit scx-common; };
lavd = final.callPackage ../pkgs/scx-git/lavd { inherit scx-common; };
layered = final.callPackage ../pkgs/scx-git/layered { inherit scx-common; };
rlfifo = final.callPackage ../pkgs/scx-git/rlfifo { inherit scx-common; };
rustland = final.callPackage ../pkgs/scx-git/rustland { inherit scx-common; };
# FIXME-SCX: rusty will fail to build unless https://github.com/NixOS/nixpkgs/pull/352077 is available in unstable
# rusty = final.callPackage ../pkgs/scx-git/rusty { inherit scx-common; };
# FIXME-SCX: add rusty to full once the above PR is available in unstable
full = final.callPackage ../pkgs/scx-git/full.nix { inherit final; };
};

sway-unwrapped_git = callOverride ../pkgs/sway-unwrapped-git { };
Expand Down
Loading

0 comments on commit 7743005

Please sign in to comment.