mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-12 02:40:31 +08:00
lixPackageSets.git: 2.94.0-pre-20250704_362bfd827f52 -> 2.94.0-pre-20250807_8bbd5e1d0df9
(cherry picked from commit 28a8bb1740)
This commit is contained in:
committed by
github-actions[bot]
parent
7ddb7fe62c
commit
8c6084146f
@@ -100,6 +100,7 @@ let
|
||||
isLegacyParser = lib.versionOlder version "2.91";
|
||||
hasDtraceSupport = lib.versionAtLeast version "2.93";
|
||||
parseToYAML = lib.versionAtLeast version "2.93";
|
||||
usesCapnp = lib.versionAtLeast version "2.94";
|
||||
in
|
||||
# gcc miscompiles coroutines at least until 13.2, possibly longer
|
||||
# do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
|
||||
@@ -143,9 +144,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
p.toml
|
||||
]
|
||||
++ lib.optionals finalAttrs.doInstallCheck [
|
||||
p.aiohttp
|
||||
p.pytest
|
||||
p.pytest-xdist
|
||||
]
|
||||
++ lib.optionals usesCapnp [ p.pycapnp ]
|
||||
))
|
||||
pkg-config
|
||||
flex
|
||||
@@ -177,6 +180,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]
|
||||
++ lib.optionals pastaFod [ passt ]
|
||||
++ lib.optionals parseToYAML [ yq ]
|
||||
++ lib.optionals usesCapnp [ capnproto ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];
|
||||
|
||||
buildInputs = [
|
||||
@@ -293,9 +297,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p $devdoc/nix-support
|
||||
echo "devdoc internal-api $devdoc/share/doc/nix/internal-api" >> $devdoc/nix-support/hydra-build-products
|
||||
''
|
||||
+ lib.optionalString (!hasExternalLixDoc) ''
|
||||
+ lib.optionalString (lib.versionOlder version "2.94" && !hasExternalLixDoc) ''
|
||||
# We do not need static archives.
|
||||
# FIXME(Raito): why are they getting installed _at all_ ?
|
||||
rm $out/lib/liblix_doc.a
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
|
||||
@@ -65,6 +65,6 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.gpl3;
|
||||
teams = [ lib.teams.lix ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isStatic;
|
||||
broken = lib.versionOlder version "2.94" && stdenv.hostPlatform.isStatic;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -243,20 +243,20 @@ lib.makeExtensible (self: {
|
||||
attrName = "git";
|
||||
|
||||
lix-args = rec {
|
||||
version = "2.94.0-pre-20250704_${builtins.substring 0 12 src.rev}";
|
||||
version = "2.94.0-pre-20250807_${builtins.substring 0 12 src.rev}";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.lix.systems";
|
||||
owner = "lix-project";
|
||||
repo = "lix";
|
||||
rev = "362bfd827f522b57062e4ebcb465bb51941632a4";
|
||||
hash = "sha256-4CVRbeYExqIDpFH+QMZb5IeUGkP6kA/zHSuExYoZygk=";
|
||||
rev = "8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb";
|
||||
hash = "sha256-P+WiN95OjCqHhfygglS/VOFTSj7qNdL5XQDo2wxhQqg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
name = "lix-${version}";
|
||||
inherit src;
|
||||
hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
|
||||
hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user