Unverified Commit df399abc authored by John Titor's avatar John Titor
Browse files

scx.full: 1.0.6 -> 1.0.7 

Cherry-picked upstream patches:

https://github.com/sched-ext/scx/commit/22d45e6ddbea81efc17a91ca6d713a7e396cea52
https://github.com/sched-ext/scx/commit/a72c24e7e5670b4533c4508d6d6c980d8487cb50
https://github.com/sched-ext/scx/commit/21cf3ccd1d263cf7aac3afe337911f18ba329dca



Signed-off-by: default avatarJohn Titor <50095635+JohnRTitor@users.noreply.github.com>
parent 268bc0de

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

+17 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  llvmPackages,

  fetchFromGitHub,

  fetchpatch,

  writeShellScript,

  bash,

  meson,
@@ -28,6 +29,22 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { 
  pname = "scx_cscheds";

  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

  # can be found in meson.build of scx src

  # grep 'bpftool_commit =' ./meson.build

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

+7 −7
Original line number Diff line number Diff line 
{

  "scx": {

    "version": "1.0.6",

    "hash": "sha256-hE0O15/9fplKrkmdiiHRJK6DzD9XaGhBwtGPqq/sX58=",

    "cargoHash": "sha256-K/pLWEUQyzdGDBhP5MXVOiAXCA4h0dh0S2q0SzlsSDY="

    "version": "1.0.7",

    "hash": "sha256-qiXgRsbYP7aPGDM8R+Z6M5klKGwFXWBONvKVLoEkW3s=",

    "cargoHash": "sha256-0Wdr+hCkGianyuFBq9hh+cPCvqedNQq52zWtH4tEhrM="

  },

  "bpftool": {

    "rev": "77a72987353fcae8ce330fd87d4c7afb7677a169",

    "hash": "sha256-pItTVewlXgB97AC/WH9rW9J/eYSe2ZdBkJaAgGnDeUU="

    "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",

    "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="

  },

  "libbpf": {

    "rev": "686f600bca59e107af4040d0838ca2b02c14ff50",

    "hash": "sha256-uIu57gFkPhBCq3RqKb6J4r5OB4X5/V9q8HqIafUc+Do="

    "rev": "c5f22aca0f3aa855daa159b2777472b35e721804",

    "hash": "sha256-ggGVqAkdZt28KAx+LztVIYGxj0j79hKcPKmUy8TrJy8="

  }

}