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.

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

scx-git: init; scx: remove #910

Merged
merged 3 commits into from
Nov 3, 2024
Merged

scx-git: init; scx: remove #910

merged 3 commits into from
Nov 3, 2024

Conversation

JohnRTitor
Copy link
Collaborator

@JohnRTitor JohnRTitor commented Oct 31, 2024

🐟 What?

  1. Remove scx to prevent conflicts.
  2. Override the scx packages of Nixpkgs to provide a git version here

🎣 Why?

Scx is now available on Nixpkgs (stable version). So it makes sense to replace with the git version here.

🍥 Pending

  • Override the rust packages
  • Cook an update script for this, referencing nixpkgs, or modify the existing one.
  • Publishing to news' channel.

After this is done, we will need to announce to the users asking to change their packages to scx_git.full. If they want to use the nixpkgs version, they should switch to scx.full.

🐳 Extras

I will recommend merging this after these PR reach unstable.

@JohnRTitor

This comment was marked as outdated.

Copy link
Contributor

Thank you for contributing to nyx! Please run nix fmt on your code before submitting a pull request. Afterwards, please force push your changes.

overlays/default.nix Outdated Show resolved Hide resolved
@JohnRTitor JohnRTitor force-pushed the scx-git branch 3 times, most recently from e245a9a to 7227eda Compare November 1, 2024 17:14
@JohnRTitor JohnRTitor marked this pull request as ready for review November 1, 2024 17:14
@JohnRTitor JohnRTitor requested a review from a team as a code owner November 1, 2024 17:14
@JohnRTitor
Copy link
Collaborator Author

❯  nix build .#scx_git.full .#scx_git.rustland .#scx_git.bpfland .#scx_git.cscheds .#scx_git.lavd .#scx_git.layered .#scx_git.rlfifo --print-out-paths 

/nix/store/ld2yx48yviiz0lpqac991l7xnsnmfgha-scx_full-unstable-20241101144355-9bba51a
/nix/store/xc9w481g4li7fwkyj317acgr462xfkdq-scx_rustland-unstable-20241101144355-9bba51a
/nix/store/xx68snlgqrspb3j298wc2hsqz3gkwkhx-scx_bpfland-unstable-20241101144355-9bba51a
/nix/store/q4l2qpd1nfyizhds9ax19805s85h2q0r-scx_csheds-unstable-20241101144355-9bba51a
/nix/store/ybs3n39sl9bw7swv7kg5nfp79kfvfg3k-scx_lavd-unstable-20241101144355-9bba51a
/nix/store/0lry6f5kknh16rfjmfbsgrbvdk522fp6-scx_layered-unstable-20241101144355-9bba51a
/nix/store/c1yqi50485ga1lj1in6gv06cy8jvxprm-scx_rlfifo-unstable-20241101144355-9bba51a

Everything above builds at the moment, and technically this is ready for merging. But I would like to wait until some merged PRs on Nixpkgs is available on unstable.

JohnRTitor

This comment was marked as resolved.

@JohnRTitor
Copy link
Collaborator Author

JohnRTitor commented Nov 1, 2024

Work is pretty much done ^^ except for the above changes which depend on nixpkgs bump.

PRs to track:

@JohnRTitor JohnRTitor added the needs-cache Needs to be pushed to Cachix label Nov 1, 2024

This comment was marked as outdated.

@github-actions github-actions bot removed the needs-cache Needs to be pushed to Cachix label Nov 1, 2024
@JohnRTitor JohnRTitor added the needs-cache Needs to be pushed to Cachix label Nov 1, 2024

This comment was marked as outdated.

@github-actions github-actions bot removed the needs-cache Needs to be pushed to Cachix label Nov 1, 2024
@JohnRTitor JohnRTitor added the needs-cache Needs to be pushed to Cachix label Nov 1, 2024

This comment was marked as outdated.

@github-actions github-actions bot removed the needs-cache Needs to be pushed to Cachix label Nov 1, 2024
@JohnRTitor JohnRTitor added the needs-cache Needs to be pushed to Cachix label Nov 1, 2024
@JohnRTitor
Copy link
Collaborator Author

If this does not work I am done with fixing the CI.

I have no clue where the problem lies my gosh.

Copy link
Contributor

github-actions bot commented Nov 1, 2024

Oops! Something went wrong while caching this PR! Check the logs for more information.

@github-actions github-actions bot removed the needs-cache Needs to be pushed to Cachix label Nov 1, 2024
@JohnRTitor JohnRTitor force-pushed the scx-git branch 2 times, most recently from 201f464 to bf1d035 Compare November 3, 2024 19:55
@JohnRTitor
Copy link
Collaborator Author

@PedroHLC can we get this reviewed :)

@PedroHLC PedroHLC merged commit 09f0dcf into chaotic-cx:main Nov 3, 2024
2 checks passed
@PedroHLC PedroHLC deleted the scx-git branch November 3, 2024 22:57
@DataEraserC
Copy link

Hello maintainers, just a reminder to inform users about updating their configurations to use scx_git.full instead of the default pkgs.scx. It's also recommended to set a correct default value that aligns with scx_git.full, as the previous default (pkgs.scx) may lead to unexpected issues.

@piyoki
Copy link
Contributor

piyoki commented Nov 4, 2024

Hello maintainers, just a reminder to inform users about updating their configurations to use scx_git.full instead of the default pkgs.scx. It's also recommended to set a correct default value that aligns with scx_git.full, as the previous default (pkgs.scx) may lead to unexpected issues.

Exactly, here's what I am doing currently:

{ pkgs, ... }:

{
  environment.systemPackages = with pkgs; [ scx ];

  # --- New Configuration ---
  chaotic.scx = {
    enable = true;
    package = pkgs.scx;
    # one of "scx_bpfland", "scx_central", "scx_flatcg", "scx_lavd", "scx_layered", "scx_nest", "scx_pair", "scx_qmap", "scx_rlfifo", "scx_rustland", "scx_rusty", "scx_simple", "scx_userland"
    scheduler = "scx_bpfland";
  };

}

@JohnRTitor
Copy link
Collaborator Author

It's also recommended to set a correct default value that aligns with scx_git.full

Yup, PRs welcomed.
We need to change

package = lib.mkPackageOption pkgs "scx" { };
to
https://github.com/NixOS/nixpkgs/blob/1f6ff249fe86a678965436f4d3c9c4a7e5601562/nixos/modules/services/scheduling/scx.nix#L23-L36

And we can remove the module entirely from here once the upstream PR is merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants