scx.full: 1.0.14 -> 1.0.15

(cherry picked from commit 3504949759)

pkgs/os-specific/linux/scx/scx_cscheds.nix

@@ -58,10 +58,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
     substituteInPlace meson.build \
       --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"
-
-    # TODO: Remove in next release.
-    substituteInPlace lib/scxtest/overrides.h \
-      --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1'
   '';
 
   nativeBuildInputs = [
@@ -89,7 +85,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       "systemd" = false;
       # not for nix
       "openrc" = false;
-      "libalpm" = false;
     })
     (lib.mapAttrsToList lib.mesonBool {
       # needed libs are already fetched as FOD
@@ -106,16 +101,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     "zerocallusedregs"
   ];
 
-  # We copy the compiled header files to the dev output
-  # These are needed for the rust schedulers
-  postFixup = ''
-    mkdir -p ${placeholder "dev"}
-    cp -r libbpf ${placeholder "dev"}
-  '';
-
   outputs = [
     "bin"
-    "dev"
     "out"
   ];
 

pkgs/os-specific/linux/scx/scx_rustscheds.nix

@@ -7,7 +7,6 @@
   zlib,
   zstd,
   scx-common,
-  scx,
   protobuf,
   libseccomp,
 }:
@@ -17,12 +16,6 @@ rustPlatform.buildRustPackage {
 
   inherit (scx-common.versionInfo.scx) cargoHash;
 
-  # Copy compiled headers and libs from scx.cscheds
-  postPatch = ''
-    mkdir libbpf
-    cp -r ${scx.cscheds.dev}/libbpf/* libbpf/
-  '';
-
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook
@@ -37,18 +30,6 @@ rustPlatform.buildRustPackage {
 
   env = {
     BPF_CLANG = lib.getExe llvmPackages.clang;
-    BPF_EXTRA_CFLAGS_PRE_INCL = lib.concatStringsSep " " [
-      "-I${scx.cscheds.dev}/libbpf/src/usr/include"
-      "-I${scx.cscheds.dev}/libbpf/include/uapi"
-      "-I${scx.cscheds.dev}/libbpf/include/linux"
-    ];
-    RUSTFLAGS = lib.concatStringsSep " " [
-      "-C relocation-model=pic"
-      "-C link-args=-lelf"
-      "-C link-args=-lz"
-      "-C link-args=-lzstd"
-      "-L ${scx.cscheds.dev}/libbpf/src"
-    ];
   };
 
   hardeningDisable = [
@@ -63,6 +44,7 @@ rustPlatform.buildRustPackage {
     "--skip=compat::tests::test_struct_has_field"
     "--skip=cpumask"
     "--skip=topology"
+    "--skip=proc_data::tests::test_thread_operations"
   ];
 
   meta = scx-common.meta // {

pkgs/os-specific/linux/scx/version.json

@@ -1,15 +1,15 @@
 {
   "scx": {
-    "version": "1.0.14",
-    "hash": "sha256-Wh+8vaQO93Erj+z8S2C633UDmUrFjQc3Bg+Nm7EML0E=",
-    "cargoHash": "sha256-6uiDx2/5ZcYkz8x8vuOTEUclIttzxVMvh1Q6QHg9N6E="
+    "version": "1.0.15",
+    "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=",
+    "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs="
   },
   "bpftool": {
     "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
     "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="
   },
   "libbpf": {
-    "rev": "c5f22aca0f3aa855daa159b2777472b35e721804",
-    "hash": "sha256-ggGVqAkdZt28KAx+LztVIYGxj0j79hKcPKmUy8TrJy8="
+    "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",
+    "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="
   }
 }