commit f36204cb00bb4b7b3e869874457bf53c7b937ee6 · pyrox.dev/nixpkgs

+16 -1

pkgs/tools/package-management/lix/common-lix.nix

···

       42
       42
        
         libarchive,

     

       43
       43
        
         libcpuid,

     

       44
       44
        
         libsodium,

     

       45
       45
       +
         libsystemtap,

     

       45
       46
        
         llvmPackages,

     

       46
       47
        
         lowdown,

     

       47
       48
        
         lowdown-unsandboxed,

     
···

       59
       60
        
         pkg-config,

     

       60
       61
        
         rapidcheck,

     

       61
       62
        
         sqlite,

     

       63
       63
       +
         systemtap-sdt,

     

       62
       64
        
         util-linuxMinimal,

     

       63
       65
        
         removeReferencesTo,

     

       64
       66
        
         xz,

     

       67
       67
       +
         yq,

     

       65
       68
        
         nixosTests,

     

       66
       69
        
         rustPlatform,

     

       67
       70
        
         # Only used for versions before 2.92.

     
···

       76
       79
        
         enableStrictLLVMChecks ? true,

     

       77
       80
        
         withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),

     

       78
       81
        
         aws-sdk-cpp,

     

       82
       82
       +
         # FIXME support Darwin once https://github.com/NixOS/nixpkgs/pull/392918 lands

     

       83
       83
       +
         withDtrace ?

     

       84
       84
       +
           lib.meta.availableOn stdenv.hostPlatform libsystemtap

     

       85
       85
       +
           && lib.meta.availableOn stdenv.buildPlatform systemtap-sdt,

     

       79
       86
        
         # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50

     

       80
       87
        
         withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,

     

       81
       88
        
         libseccomp,

     
···

       88
       95
        
         isLLVMOnly = lib.versionAtLeast version "2.92";

     

       89
       96
        
         hasExternalLixDoc = lib.versionOlder version "2.92";

     

       90
       97
        
         isLegacyParser = lib.versionOlder version "2.91";

     

       98
       98
       +
         hasDtraceSupport = lib.versionAtLeast version "2.93";

     

       99
       99
       +
         parseToYAML = lib.versionAtLeast version "2.93";

     

       91
       100
        
       in

     

       92
       101
        
       # gcc miscompiles coroutines at least until 13.2, possibly longer

     

       93
       102
        
       # do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.

     
···

       159
       168
        
             mdbook-linkcheck

     

       160
       169
        
             doxygen

     

       161
       170
        
           ]

     

       171
       171
       +
           ++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]

     

       172
       172
       +
           ++ lib.optionals parseToYAML [ yq ]

     

       162
       173
        
           ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];

     

       163
       174
        
       

     

       164
       175
        
         buildInputs =

     
···

       187
       198
        
           ++ lib.optionals stdenv.hostPlatform.isStatic [ llvmPackages.libunwind ]

     

       188
       199
        
           ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ]

     

       189
       200
        
           ++ lib.optionals withLibseccomp [ libseccomp ]

     

       190
       190
       -
           ++ lib.optionals withAWS [ aws-sdk-cpp ];

     

       201
       201
       +
           ++ lib.optionals withAWS [ aws-sdk-cpp ]

     

       202
       202
       +
           ++ lib.optionals (hasDtraceSupport && withDtrace) [ libsystemtap ];

     

       191
       203
        
       

     

       192
       204
        
         inherit cargoDeps;

     

       193
       205
        
       

     
···

       255
       267
        
             (lib.mesonOption "store-dir" storeDir)

     

       256
       268
        
             (lib.mesonOption "state-dir" stateDir)

     

       257
       269
        
             (lib.mesonOption "sysconfdir" confDir)

     

       270
       270
       +
           ]

     

       271
       271
       +
           ++ lib.optionals hasDtraceSupport [

     

       272
       272
       +
             (lib.mesonEnable "dtrace-probes" withDtrace)

     

       258
       273
        
           ]

     

       259
       274
        
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       260
       275
        
             (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")

+11 -5

pkgs/tools/package-management/lix/common-nix-eval-jobs.nix

···

       11
       11
        
         lib,

     

       12
       12
        
         lix,

     

       13
       13
        
         boost,

     

       14
       14
       +
         capnproto,

     

       14
       15
        
         nlohmann_json,

     

       15
       16
        
         meson,

     

       16
       17
        
         pkg-config,

     
···

       23
       24
        
         pname = "nix-eval-jobs";

     

       24
       25
        
         version = "${version}${suffix}";

     

       25
       26
        
         inherit src patches;

     

       26
       26
       -
         buildInputs = [

     

       27
       27
       -
           nlohmann_json

     

       28
       28
       -
           lix

     

       29
       29
       -
           boost

     

       30
       30
       -
         ];

     

       27
       27
       +
         sourceRoot = if lib.versionAtLeast version "2.93" then "source/subprojects/nix-eval-jobs" else null;

     

       28
       28
       +
         buildInputs =

     

       29
       29
       +
           [

     

       30
       30
       +
             nlohmann_json

     

       31
       31
       +
             lix

     

       32
       32
       +
             boost

     

       33
       33
       +
           ]

     

       34
       34
       +
           ++ lib.optionals (lib.versionAtLeast version "2.93") [

     

       35
       35
       +
             capnproto

     

       36
       36
       +
           ];

     

       31
       37
        
         nativeBuildInputs = [

     

       32
       38
        
           meson

     

       33
       39
        
           pkg-config

+26 -3

pkgs/tools/package-management/lix/default.nix

···

       8
       8
        
         callPackage,

     

       9
       9
        
         fetchgit,

     

       10
       10
        
         fetchFromGitHub,

     

       11
       11
       +
         fetchFromGitea,

     

       11
       12
        
         rustPlatform,

     

       12
       13
        
         editline,

     

       13
       14
        
         ncurses,

     
···

       25
       26
        
           {

     

       26
       27
        
             attrName,

     

       27
       28
        
             lix-args,

     

       28
       28
       -
             nix-eval-jobs-args,

     

       29
       29
       +
             # Starting with 2.93, `nix-eval-jobs` lives in the `lix` repository.

     

       30
       30
       +
             nix-eval-jobs-args ? { inherit (lix-args) version src; },

     

       29
       31
        
           }:

     

       30
       32
        
           let

     

       31
       33
        
             # GCC 13.2 is known to miscompile Lix coroutines (introduced in 2.92).

     
···

       192
       194
        
             cargoDeps = rustPlatform.fetchCargoVendor {

     

       193
       195
        
               name = "lix-${version}";

     

       194
       196
        
               inherit src;

     

       195
       195
       -
               allowGitDependencies = false;

     

       196
       197
        
               hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";

     

       197
       198
        
             };

     

       198
       199
        
           };

     
···

       207
       208
        
           };

     

       208
       209
        
         };

     

       209
       210
        
       

     

       210
       210
       -
         latest = self.lix_2_92;

     

       211
       211
       +
         lix_2_93 = self.makeLixScope {

     

       212
       212
       +
           attrName = "lix_2_93";

     

       213
       213
       +
       

     

       214
       214
       +
           lix-args = rec {

     

       215
       215
       +
             version = "2.93.0";

     

       216
       216
       +
       

     

       217
       217
       +
             src = fetchFromGitea {

     

       218
       218
       +
               domain = "git.lix.systems";

     

       219
       219
       +
               owner = "lix-project";

     

       220
       220
       +
               repo = "lix";

     

       221
       221
       +
               rev = version;

     

       222
       222
       +
               hash = "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=";

     

       223
       223
       +
             };

     

       224
       224
       +
       

     

       225
       225
       +
             cargoDeps = rustPlatform.fetchCargoVendor {

     

       226
       226
       +
               name = "lix-${version}";

     

       227
       227
       +
               inherit src;

     

       228
       228
       +
               hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";

     

       229
       229
       +
             };

     

       230
       230
       +
           };

     

       231
       231
       +
         };

     

       232
       232
       +
       

     

       233
       233
       +
         latest = self.lix_2_93;

     

       211
       234
        
       

     

       212
       235
        
         # Note: This is not yet 2.92 because of a non-deterministic `curl` error.

     

       213
       236
        
         # See: https://git.lix.systems/lix-project/lix/issues/662