Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 4 additions & 1 deletion pkgs/os-specific/linux/scx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ let
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
badPlatforms = [ "aarch64-linux" ];
maintainers = with lib.maintainers; [ johnrtitor ];
maintainers = with lib.maintainers; [
johnrtitor
Gliczy
];
};
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/scx/scx_cscheds.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
pkg-config
zstd
protobuf
llvmPackages.libllvm
]
++ bpftools.buildInputs
++ bpftools.nativeBuildInputs;
Expand Down Expand Up @@ -125,8 +126,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
"out"
];

# Enable this when default kernel in nixpkgs is 6.12+
doCheck = false;
doCheck = true;

meta = scx-common.meta // {
description = "Sched-ext C userspace schedulers";
Expand Down
10 changes: 8 additions & 2 deletions pkgs/os-specific/linux/scx/scx_rustscheds.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,14 @@ rustPlatform.buildRustPackage {
"zerocallusedregs"
];

# Enable this when default kernel in nixpkgs is 6.12+
doCheck = false;
doCheck = true;
checkFlags = [
"--skip=compat::tests::test_ksym_exists"
"--skip=compat::tests::test_read_enum"
"--skip=compat::tests::test_struct_has_field"
"--skip=cpumask"
"--skip=topology"
];

meta = scx-common.meta // {
description = "Sched-ext Rust userspace schedulers";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/scx/version.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"scx": {
"version": "1.0.12",
"hash": "sha256-ti4SPx66Ykwqsel7l8Rb0WEBypFbQKoDd0foMAtEmlE=",
"cargoHash": "sha256-nD+RalFCJLqQGMVtaJm/NLCrY8Iq5/eAsW+ydABvw2o="
"version": "1.0.13",
"hash": "sha256-uSYkAsDZEWJ7sB6jd7PZrwYepeLlTdiTi4kAgSDeVsU=",
"cargoHash": "sha256-+JDe7l4wX2balOUD11M9z60JSaRyMaIO7Pw1NrjnE30="
},
"bpftool": {
"rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
Expand Down