movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

scx.full: 1.0.6 -> 1.0.7; nixos/scx: add new schedulers (#363306)

Browse source
This commit is contained in:
Masum Reza 2024-12-09 00:03:35 +05:30 • committed by GitHub
commit 73b9f2d20b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/scheduling/scx.nix
View file

@ -40,15 +40,18 @@ in
type = lib.types.enum [ type = lib.types.enum [
"scx_bpfland" "scx_bpfland"
"scx_central" "scx_central"
"scx_flash"
"scx_flatcg" "scx_flatcg"
"scx_lavd" "scx_lavd"
"scx_layered" "scx_layered"
"scx_mitosis"
"scx_nest" "scx_nest"
"scx_pair" "scx_pair"
"scx_qmap" "scx_qmap"
"scx_rlfifo" "scx_rlfifo"
"scx_rustland" "scx_rustland"
"scx_rusty" "scx_rusty"
"scx_sdt"
"scx_simple" "scx_simple"
"scx_userland" "scx_userland"
]; ];

17
pkgs/os-specific/linux/scx/scx_cscheds.nix
View file

@ -2,6 +2,7 @@
lib, lib,
llvmPackages, llvmPackages,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
writeShellScript, writeShellScript,
bash, bash,
meson, meson,
@ -28,6 +29,22 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "scx_cscheds"; pname = "scx_cscheds";
inherit (scx-common) version src; inherit (scx-common) version src;
patches = [
# TODO: remove at the next point release
(fetchpatch {
url = "https://github.com/sched-ext/scx/commit/22d45e6ddbea81efc17a91ca6d713a7e396cea52.patch?full_index=1";
hash = "sha256-SLSQNqRpKNT1HuuuT1h+fR1o3nbbVpfRCB30cFieIeg=";
})
(fetchpatch {
url = "https://github.com/sched-ext/scx/commit/a72c24e7e5670b4533c4508d6d6c980d8487cb50.patch?full_index=1";
hash = "sha256-RUo7tl3V8iPN/fEm0oyj8UBwiWdna/ttZh+/OtcvflE=";
})
(fetchpatch {
url = "https://github.com/sched-ext/scx/commit/21cf3ccd1d263cf7aac3afe337911f18ba329dca.patch?full_index=1";
hash = "sha256-vOHM+1QvVxI89azqoIrOhjfSyYHTMGuIWAAupcGQ7Oc=";
})
];
# scx needs specific commits of bpftool and libbpf # scx needs specific commits of bpftool and libbpf
# can be found in meson.build of scx src # can be found in meson.build of scx src
# grep 'bpftool_commit =' ./meson.build # grep 'bpftool_commit =' ./meson.build

14
pkgs/os-specific/linux/scx/version.json
View file

@ -1,15 +1,15 @@
{ {
"scx": { "scx": {
"version": "1.0.6", "version": "1.0.7",
"hash": "sha256-hE0O15/9fplKrkmdiiHRJK6DzD9XaGhBwtGPqq/sX58=", "hash": "sha256-qiXgRsbYP7aPGDM8R+Z6M5klKGwFXWBONvKVLoEkW3s=",
"cargoHash": "sha256-K/pLWEUQyzdGDBhP5MXVOiAXCA4h0dh0S2q0SzlsSDY=" "cargoHash": "sha256-0Wdr+hCkGianyuFBq9hh+cPCvqedNQq52zWtH4tEhrM="
}, },
"bpftool": { "bpftool": {
"rev": "77a72987353fcae8ce330fd87d4c7afb7677a169", "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
"hash": "sha256-pItTVewlXgB97AC/WH9rW9J/eYSe2ZdBkJaAgGnDeUU=" "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="
}, },
"libbpf": { "libbpf": {
"rev": "686f600bca59e107af4040d0838ca2b02c14ff50", "rev": "c5f22aca0f3aa855daa159b2777472b35e721804",
"hash": "sha256-uIu57gFkPhBCq3RqKb6J4r5OB4X5/V9q8HqIafUc+Do=" "hash": "sha256-ggGVqAkdZt28KAx+LztVIYGxj0j79hKcPKmUy8TrJy8="
} }
} }