diff --git a/less b/less new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix index 6e645f2f210e..112c6a9edc89 100644 --- a/pkgs/os-specific/linux/scx/default.nix +++ b/pkgs/os-specific/linux/scx/default.nix @@ -2,6 +2,7 @@ lib, callPackage, fetchFromGitHub, + fetchpatch2, }: let scx-common = rec { @@ -16,6 +17,15 @@ let inherit (versionInfo.scx) hash; }; + patches = [ + # Remove after new release + (fetchpatch2 { + name = "fix-builds-on-debug-fs-kernels"; + url = "https://github.com/sched-ext/scx/commit/3c09e8c8c62efd701107f4c2071211db02341d62.patch?full_index=1"; + hash = "sha256-jLMlCKBYQKS6sf5pZy5z19iSmX9bu9rlXHmGVaxTOho="; + }) + ]; + meta = { homepage = "https://github.com/sched-ext/scx"; changelog = "https://github.com/sched-ext/scx/releases/tag/v${versionInfo.scx.version}"; diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix index 84b07682015d..78861dfd5024 100644 --- a/pkgs/os-specific/linux/scx/scx_cscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix @@ -26,7 +26,7 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "scx_cscheds"; - inherit (scx-common) version src; + inherit (scx-common) version src patches; # scx needs specific commits of bpftool and libbpf # can be found in meson.build of scx src diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix index 2e4cabfb95ea..fa002ea5811b 100644 --- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix @@ -11,7 +11,7 @@ }: rustPlatform.buildRustPackage { pname = "scx_rustscheds"; - inherit (scx-common) version src; + inherit (scx-common) version src patches; useFetchCargoVendor = true; inherit (scx-common.versionInfo.scx) cargoHash; diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json index 91b2346e4447..3b98f94a3f40 100644 --- a/pkgs/os-specific/linux/scx/version.json +++ b/pkgs/os-specific/linux/scx/version.json @@ -1,8 +1,8 @@ { "scx": { - "version": "1.0.9", - "hash": "sha256-9F6/fkNnyHa9Ud7Kcp2TvRLQE/QEt/rDFETvwiPtx8E=", - "cargoHash": "sha256-0K9NyvCgS1Y/puDSFgGoZmGJ5u9E/lEcFuiBUHReC7g=" + "version": "1.0.10", + "hash": "sha256-IJn3MAPEwxImHUfHV7zPNlAlHXvzOkH0S7eJDNnupf0=", + "cargoHash": "sha256-d0TvLhBaDgqi4/dtVgL+UOn78uaqSpdFxm4kBdVyCR4=" }, "bpftool": { "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",