commit 350494975943afe5036f8165c15fdcaa106fb05d · pyrox.dev/nixpkgs

-13

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

···

       58
       58
        
           cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf

     

       59
       59
        
           substituteInPlace meson.build \

     

       60
       60
        
             --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"

     

       61
       61
       -
       

     

       62
       62
       -
           # TODO: Remove in next release.

     

       63
       63
       -
           substituteInPlace lib/scxtest/overrides.h \

     

       64
       64
       -
             --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1'

     

       65
       61
        
         '';

     

       66
       62
        
       

     

       67
       63
        
         nativeBuildInputs = [

     
···

       89
       85
        
             "systemd" = false;

     

       90
       86
        
             # not for nix

     

       91
       87
        
             "openrc" = false;

     

       92
       92
       -
             "libalpm" = false;

     

       93
       88
        
           })

     

       94
       89
        
           (lib.mapAttrsToList lib.mesonBool {

     

       95
       90
        
             # needed libs are already fetched as FOD

     
···

       106
       101
        
           "zerocallusedregs"

     

       107
       102
        
         ];

     

       108
       103
        
       

     

       109
       109
       -
         # We copy the compiled header files to the dev output

     

       110
       110
       -
         # These are needed for the rust schedulers

     

       111
       111
       -
         postFixup = ''

     

       112
       112
       -
           mkdir -p ${placeholder "dev"}

     

       113
       113
       -
           cp -r libbpf ${placeholder "dev"}

     

       114
       114
       -
         '';

     

       115
       115
       -
       

     

       116
       104
        
         outputs = [

     

       117
       105
        
           "bin"

     

       118
       118
       -
           "dev"

     

       119
       106
        
           "out"

     

       120
       107
        
         ];

     

       121
       108

+1 -19

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

···

       7
       7
        
         zlib,

     

       8
       8
        
         zstd,

     

       9
       9
        
         scx-common,

     

       10
       10
       -
         scx,

     

       11
       10
        
         protobuf,

     

       12
       11
        
         libseccomp,

     

       13
       12
        
       }:

     
···

       17
       16
        
       

     

       18
       17
        
         inherit (scx-common.versionInfo.scx) cargoHash;

     

       19
       18
        
       

     

       20
       20
       -
         # Copy compiled headers and libs from scx.cscheds

     

       21
       21
       -
         postPatch = ''

     

       22
       22
       -
           mkdir libbpf

     

       23
       23
       -
           cp -r ${scx.cscheds.dev}/libbpf/* libbpf/

     

       24
       24
       -
         '';

     

       25
       25
       -
       

     

       26
       19
        
         nativeBuildInputs = [

     

       27
       20
        
           pkg-config

     

       28
       21
        
           rustPlatform.bindgenHook

     
···

       37
       30
        
       

     

       38
       31
        
         env = {

     

       39
       32
        
           BPF_CLANG = lib.getExe llvmPackages.clang;

     

       40
       40
       -
           BPF_EXTRA_CFLAGS_PRE_INCL = lib.concatStringsSep " " [

     

       41
       41
       -
             "-I${scx.cscheds.dev}/libbpf/src/usr/include"

     

       42
       42
       -
             "-I${scx.cscheds.dev}/libbpf/include/uapi"

     

       43
       43
       -
             "-I${scx.cscheds.dev}/libbpf/include/linux"

     

       44
       44
       -
           ];

     

       45
       45
       -
           RUSTFLAGS = lib.concatStringsSep " " [

     

       46
       46
       -
             "-C relocation-model=pic"

     

       47
       47
       -
             "-C link-args=-lelf"

     

       48
       48
       -
             "-C link-args=-lz"

     

       49
       49
       -
             "-C link-args=-lzstd"

     

       50
       50
       -
             "-L ${scx.cscheds.dev}/libbpf/src"

     

       51
       51
       -
           ];

     

       52
       33
        
         };

     

       53
       34
        
       

     

       54
       35
        
         hardeningDisable = [

     
···

       63
       44
        
           "--skip=compat::tests::test_struct_has_field"

     

       64
       45
        
           "--skip=cpumask"

     

       65
       46
        
           "--skip=topology"

     

       47
       47
       +
           "--skip=proc_data::tests::test_thread_operations"

     

       66
       48
        
         ];

     

       67
       49
        
       

     

       68
       50
        
         meta = scx-common.meta // {

+5 -5

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

···

       1
       1
        
       {

     

       2
       2
        
         "scx": {

     

       3
       3
       -
           "version": "1.0.14",

     

       4
       4
       -
           "hash": "sha256-Wh+8vaQO93Erj+z8S2C633UDmUrFjQc3Bg+Nm7EML0E=",

     

       5
       5
       -
           "cargoHash": "sha256-6uiDx2/5ZcYkz8x8vuOTEUclIttzxVMvh1Q6QHg9N6E="

     

       3
       3
       +
           "version": "1.0.15",

     

       4
       4
       +
           "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=",

     

       5
       5
       +
           "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs="

     

       6
       6
        
         },

     

       7
       7
        
         "bpftool": {

     

       8
       8
        
           "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",

     

       9
       9
        
           "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="

     

       10
       10
        
         },

     

       11
       11
        
         "libbpf": {

     

       12
       12
       -
           "rev": "c5f22aca0f3aa855daa159b2777472b35e721804",

     

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

     

       12
       12
       +
           "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",

     

       13
       13
       +
           "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="

     

       14
       14
        
         }

     

       15
       15
        
       }