lixPackageSets.{lix_2_93,git}: init#398141
Conversation
|
The checks performed are as follows:
Updates roughly once a week with the same testing are planned. Please tell me if I missed some things I should test and I can add it to the list. (Unfortunately anything Darwin is not possible for me since I do not have appropriate hardware.) |
e2d8e3e to
b5c0cb6
Compare
lf-
left a comment
There was a problem hiding this comment.
overall lgtm, I've pointed to a few tiny nits but we can get this going pretty soon!
There was a problem hiding this comment.
huh, can you remind me why we depend on yq? i actually don't remember how that got in there.
There was a problem hiding this comment.
The dependency was introduced in https://gerrit.lix.systems/c/lix/+/2190 for some parser tests so that the output is more readable.
There was a problem hiding this comment.
ah that's a little bit silly of us since we probably should just use PyYAML instead which we already depend on but oh well.
There was a problem hiding this comment.
hm, i suspect we will need a lix branded capnproto package really soon if not now, due to patches we're doing to it. need to check details though.
There was a problem hiding this comment.
The library is already used by Lix itself. This only adds the dependency to nix-eval-jobs which started depending on canproto headers due to the async changes. If a special capnproto build is needed that could be handled similar to boehmgc, aws-sdk-cpp and editline so that it is picked up by both.
There was a problem hiding this comment.
ah okay! that should be fine then. we could potentially address this need via propagated build inputs as well; the only reason i was a little shaky on wanting to do it as propagated is that it would also affect derivations using lix only for the cli.
either approach is fine.
There was a problem hiding this comment.
Correct, I think it might even have been me who suggested making it propagated. I decided to add it to nix-eval-jobs for now at least since that's also done in the vendored packaging.
b5c0cb6 to
016506a
Compare
lf-
left a comment
There was a problem hiding this comment.
looks good to me, and derisks 2.93 packaging issues. wins all around.
b24672a to
ca5fd40
Compare
ca5fd40 to
c889250
Compare
getchoo
left a comment
There was a problem hiding this comment.
Would be awesome to get this merged for 25.05. Maybe add a release note for it too?
nixpkgs-review result
Generated using nixpkgs-review.
Command: nixpkgs-review pr 398141
x86_64-linux
✅ 30 packages built:
- lixPackageSets.git.aws-sdk-cpp (lixPackageSets.lix_2_93.aws-sdk-cpp)
- lixPackageSets.git.aws-sdk-cpp.dev (lixPackageSets.lix_2_93.aws-sdk-cpp.dev)
- lixPackageSets.git.boehmgc (lixPackageSets.lix_2_93.boehmgc)
- lixPackageSets.git.boehmgc.debug (lixPackageSets.lix_2_93.boehmgc.debug)
- lixPackageSets.git.boehmgc.dev (lixPackageSets.lix_2_93.boehmgc.dev)
- lixPackageSets.git.boehmgc.doc (lixPackageSets.lix_2_93.boehmgc.doc)
- lixPackageSets.git.editline (lixPackageSets.lix_2_93.editline)
- lixPackageSets.git.editline.dev (lixPackageSets.lix_2_93.editline.dev)
- lixPackageSets.git.editline.doc (lixPackageSets.lix_2_93.editline.doc)
- lixPackageSets.git.editline.man (lixPackageSets.lix_2_93.editline.man)
- lixPackageSets.git.lix
- lixPackageSets.git.lix.debug
- lixPackageSets.git.lix.dev
- lixPackageSets.git.lix.devdoc
- lixPackageSets.git.lix.doc
- lixPackageSets.git.lix.man
- lixPackageSets.git.nix-direnv
- lixPackageSets.git.nix-eval-jobs
- lixPackageSets.git.nix-fast-build
- lixPackageSets.git.nix-fast-build.dist
- lixPackageSets.latest.lix (lixPackageSets.lix_2_93.lix)
- lixPackageSets.latest.lix.debug (lixPackageSets.lix_2_93.lix.debug)
- lixPackageSets.latest.lix.dev (lixPackageSets.lix_2_93.lix.dev)
- lixPackageSets.latest.lix.devdoc (lixPackageSets.lix_2_93.lix.devdoc)
- lixPackageSets.latest.lix.doc (lixPackageSets.lix_2_93.lix.doc)
- lixPackageSets.latest.lix.man (lixPackageSets.lix_2_93.lix.man)
- lixPackageSets.latest.nix-direnv (lixPackageSets.lix_2_93.nix-direnv)
- lixPackageSets.latest.nix-eval-jobs (lixPackageSets.lix_2_93.nix-eval-jobs)
- lixPackageSets.latest.nix-fast-build (lixPackageSets.lix_2_93.nix-fast-build)
- lixPackageSets.latest.nix-fast-build.dist (lixPackageSets.lix_2_93.nix-fast-build.dist)
There was a problem hiding this comment.
Both aarch64/x86_64-darwin are failing here and in the git package, but only the former is a regression from 2.92
It seems this is a repeat of #353576, as applying this diff fixed it:
diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 13f6d88828e6..635f52082140 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -254,7 +254,8 @@ stdenv.mkDerivation (finalAttrs: {
# Enable LTO, since it improves eval performance a fair amount
# LTO is disabled on:
# - static builds (strange linkage errors)
- (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && (isLLVMOnly || stdenv.cc.isGNU)))
+ # - darwin builds (install test failures)
+ (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isDarwin && (isLLVMOnly || stdenv.cc.isGNU)))
(lib.mesonEnable "gc" true)
(lib.mesonBool "enable-tests" true)
(lib.mesonBool "enable-docs" enableDocumentation)It might be best to keep this, as I'm unsure if it's UB from the test's code (from a quick look this seems unlikely) or the LTO-ized Lix binary. The only side effect it would have is retroactively disabling LTO on Lix 2.92 for Darwin (as that's the only place it's enabled currently) where tests do pass; though this might still be an issue for 2.92 and it just isn't being caught
Edit: reported upstream in https://git.lix.systems/lix-project/lix/issues/832
There was a problem hiding this comment.
Should we set this as stable too? AFAIK there are no upstream or third party blockers like 2.92, and @RaitoBezarius signaled towards skipping over that release anyways here
There was a problem hiding this comment.
I do think we have one major regression, which is the SSH wrapper stuff, atm, that I will be trying to fix in https://gerrit.lix.systems/c/lix/+/3159 and backport it. cc @lf-
|
Can we go ahead with bumping lixVersions.latest to this while keeping lixVersions.stable at 2.91? Then we can sort out the remaining issues asynchronously. |
In agreement with this. |
Previously always the top-level lix package would be used, which is obviously not what we want.
c889250 to
39529f9
Compare
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.