talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

lixPackageSets.git: 2.94.0-pre-20250704_362bfd827f52 -> 2.94.0-pre-20250807_8bbd5e1d0df9

Browse Source
This commit is contained in:
Alois Wohlschlager 2025-07-12 14:42:13 +02:00
parent cf6821c8f8
commit 28a8bb1740
No known key found for this signature in database
GPG Key ID: E0F59EA5E5216914
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/package-management/lix/common-lix.nix
View File

@ -100,6 +100,7 @@ let
isLegacyParser = lib.versionOlder version "2.91"; isLegacyParser = lib.versionOlder version "2.91";
hasDtraceSupport = lib.versionAtLeast version "2.93"; hasDtraceSupport = lib.versionAtLeast version "2.93";
parseToYAML = lib.versionAtLeast version "2.93"; parseToYAML = lib.versionAtLeast version "2.93";
usesCapnp = lib.versionAtLeast version "2.94";
in in
# gcc miscompiles coroutines at least until 13.2, possibly longer # 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. # do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
@ -144,9 +145,11 @@ stdenv.mkDerivation (finalAttrs: {
p.toml p.toml
] ]
++ lib.optionals finalAttrs.doInstallCheck [ ++ lib.optionals finalAttrs.doInstallCheck [
p.aiohttp
p.pytest p.pytest
p.pytest-xdist p.pytest-xdist
] ]
++ lib.optionals usesCapnp [ p.pycapnp ]
)) ))
pkg-config pkg-config
flex flex
@ -178,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ] ++ lib.optionals (hasDtraceSupport && withDtrace) [ systemtap-sdt ]
++ lib.optionals pastaFod [ passt ] ++ lib.optionals pastaFod [ passt ]
++ lib.optionals parseToYAML [ yq ] ++ lib.optionals parseToYAML [ yq ]
++ lib.optionals usesCapnp [ capnproto ]
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]; ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ];
buildInputs = [ buildInputs = [
@ -294,9 +298,8 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $devdoc/nix-support mkdir -p $devdoc/nix-support
echo "devdoc internal-api $devdoc/share/doc/nix/internal-api" >> $devdoc/nix-support/hydra-build-products 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. # We do not need static archives.
# FIXME(Raito): why are they getting installed _at all_ ?
rm $out/lib/liblix_doc.a rm $out/lib/liblix_doc.a
'' ''
+ lib.optionalString stdenv.hostPlatform.isStatic '' + lib.optionalString stdenv.hostPlatform.isStatic ''

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

@ -65,6 +65,6 @@ stdenv.mkDerivation {
license = lib.licenses.gpl3; license = lib.licenses.gpl3;
teams = [ lib.teams.lix ]; teams = [ lib.teams.lix ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isStatic; broken = lib.versionOlder version "2.94" && stdenv.hostPlatform.isStatic;
}; };
} }

8
pkgs/tools/package-management/lix/default.nix
View File

@ -271,20 +271,20 @@ lib.makeExtensible (self: {
attrName = "git"; attrName = "git";
lix-args = rec { 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 { src = fetchFromGitea {
domain = "git.lix.systems"; domain = "git.lix.systems";
owner = "lix-project"; owner = "lix-project";
repo = "lix"; repo = "lix";
rev = "362bfd827f522b57062e4ebcb465bb51941632a4"; rev = "8bbd5e1d0df9c31b4d86ba07bc85beb952e42ccb";
hash = "sha256-4CVRbeYExqIDpFH+QMZb5IeUGkP6kA/zHSuExYoZygk="; hash = "sha256-P+WiN95OjCqHhfygglS/VOFTSj7qNdL5XQDo2wxhQqg=";
}; };
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
name = "lix-${version}"; name = "lix-${version}";
inherit src; inherit src;
hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8="; hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg=";
}; };
}; };
}; };