From 3982d1a49bebc87ebbfb4086f54884bf604ddbe5 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 17 Dec 2024 13:00:46 +0100 Subject: [PATCH 1/2] scx.full: 1.0.7 -> 1.0.8 --- pkgs/os-specific/linux/scx/scx_cscheds.nix | 17 ----------------- pkgs/os-specific/linux/scx/version.json | 6 +++--- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix index b6d984f8b0001..a28b184f6d386 100644 --- a/pkgs/os-specific/linux/scx/scx_cscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix @@ -2,7 +2,6 @@ lib, llvmPackages, fetchFromGitHub, - fetchpatch, writeShellScript, bash, meson, @@ -29,22 +28,6 @@ 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 diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json index 32ca1fc4a0a53..f1c52f59fe756 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.7", - "hash": "sha256-qiXgRsbYP7aPGDM8R+Z6M5klKGwFXWBONvKVLoEkW3s=", - "cargoHash": "sha256-0Wdr+hCkGianyuFBq9hh+cPCvqedNQq52zWtH4tEhrM=" + "version": "1.0.8", + "hash": "sha256-eXui9fvi8C/HHp8wU7STrDC8b950YZzyhoLoGHXZ6S8=", + "cargoHash": "sha256-ymFO6w4Y/VIKrnf0uF0Sso4OSc1MY2CeEwaXsAL5cgo=" }, "bpftool": { "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e", From 0f40303097696a5cbb31cc583ae37c79540aa80f Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:17:08 +0530 Subject: [PATCH 2/2] scx.full: remove aarch64-linux from badPlatforms builds on aarch64-linux now. --- pkgs/os-specific/linux/scx/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix index 6e645f2f210eb..fdac201f5a5fd 100644 --- a/pkgs/os-specific/linux/scx/default.nix +++ b/pkgs/os-specific/linux/scx/default.nix @@ -21,7 +21,6 @@ let changelog = "https://github.com/sched-ext/scx/releases/tag/v${versionInfo.scx.version}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - badPlatforms = [ "aarch64-linux" ]; maintainers = with lib.maintainers; [ johnrtitor ]; }; };