llvmPackages_21: 21.1.0-rc3 -> 21.1.0#437137
Conversation
|
|
|
The error message says: The only reference to that, that I can see is in So.. I'm confused where that comes from, how it sneaks into the build. Unless... something is inspecting the function args of that expression somehow? |
Same, I was staring at that error for 20 minutes and was confused how it pops up. |
|
Ah, I was just looking at the latest source code of master is currently on llvm-ffi 21.0, while Maybe we can push the eval failure out to when this hits the haskell-updates branch. Something like: - lib.warnIf shouldUpgrade
+ lib.warnIf (shouldUpgrade && super.llvm-ffi.version != "21.0")Then we can handle it later. Alternatively, wait with this PR until haskell-updates is there - but that might take quite a while, due to the stackage major update we're currently doing. |
|
After checking on Matrix, let’s comment out the warning for now? I am not sure it makes sense to block updating from a release candidate LLVM like this when we’re not even changing the default version yet. The warning seems like it’s more appropriate for |
579916d to
e3dc832
Compare
|
Ok, I took @wolfgangwalther's suggestion and changed it a bit. It should now prevent the warning when the version to check isn't supported based on llvm-ffi's version. |
|
@ofborg eval |
|
@mweinelt can you take a look at the ofborg logs for this PR? Especially the case where the label was removed, but ofborg immediately added it again, without any close/open or anything. |
|
Conflicted after #439264.
You won't need this now, anymore. This should work out fine. |
e3dc832 to
afd9652
Compare
|
Done, hopefully this is merged soon. |
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
|
@ofborg eval |
emilazy
left a comment
There was a problem hiding this comment.
No regressions; looks good. I will run another build of the default bump to make sure there are no critical Darwin regressions left in a few days.
nixpkgs-review result
Generated using nixpkgs-review.
Command: nixpkgs-review pr 437137
Commit: afd965280e1f52dace0327474b6176f23e8c386f
aarch64-darwin
❌ 5 packages failed to build:
- emscriptenPackages.libxml2
- emscriptenPackages.libxml2.bin
- emscriptenPackages.libxml2.dev
- emscriptenPackages.libxml2.devdoc
- tests.cc-wrapper.supported
✅ 54 packages built:
- angle
- bolt_21 (llvmPackages_21.bolt)
- bolt_21.dev (llvmPackages_21.bolt.dev)
- clang_21 (llvmPackages_21.clang, llvmPackages_21.libcxxClang)
- emscripten
- faust (faust2)
- faust2firefox
- faust2jackrust
- faust2ladspa
- faust2lv2
- flang_21 (llvmPackages_21.flang)
- lld_21 (llvmPackages_21.lld)
- lld_21.dev (llvmPackages_21.lld.dev)
- lld_21.lib (llvmPackages_21.lld.lib)
- lldb_21 (llvmPackages_21.lldb)
- lldb_21.dev (llvmPackages_21.lldb.dev)
- llvmPackages_21.bintools
- llvmPackages_21.bintools-unwrapped
- llvmPackages_21.bintoolsNoLibc
- llvmPackages_21.clang-manpages
- llvmPackages_21.clang-tools
- llvmPackages_21.libclang (llvmPackages_21.clang-unwrapped)
- llvmPackages_21.libclang.dev (llvmPackages_21.clang-unwrapped.dev)
- llvmPackages_21.libclang.lib (llvmPackages_21.clang-unwrapped.lib)
- llvmPackages_21.libclang.python (llvmPackages_21.clang-unwrapped.python)
- llvmPackages_21.clangNoLibcNoRt (llvmPackages_21.clangNoCompilerRt)
- llvmPackages_21.clangNoCompilerRtWithLibc
- llvmPackages_21.clangNoLibc (llvmPackages_21.clangNoLibcWithBasicRt)
- llvmPackages_21.clangNoLibcxx (llvmPackages_21.clangWithLibcAndBasicRt)
- llvmPackages_21.clangUseLLVM
- llvmPackages_21.clangWithLibcAndBasicRtAndLibcxx
- llvmPackages_21.compiler-rt (llvmPackages_21.compiler-rt-libc)
- llvmPackages_21.compiler-rt.dev (llvmPackages_21.compiler-rt-libc.dev)
- llvmPackages_21.compiler-rt-no-libc
- llvmPackages_21.compiler-rt-no-libc.dev
- llvmPackages_21.libcxx
- llvmPackages_21.libcxx.dev
- llvmPackages_21.stdenv (llvmPackages_21.libcxxStdenv)
- llvm_21 (llvmPackages_21.llvm)
- llvm_21.dev (llvmPackages_21.llvm.dev)
- llvm_21.lib (llvmPackages_21.llvm.lib)
- llvm_21.python (llvmPackages_21.llvm.python)
- llvmPackages_21.libstdcxxClang
- llvmPackages_21.libunwind
- llvmPackages_21.libunwind.dev
- llvmPackages_21.lldb-manpages
- llvmPackages_21.lldbPlugins.llef
- llvmPackages_21.llvm-manpages
- llvmPackages_21.mlir
- llvmPackages_21.mlir.dev
- llvmPackages_21.openmp
- llvmPackages_21.openmp.dev
- llvmPackages_21.tblgen
- tests.cc-wrapper.llvmTests.llvmPackages_21.clang (tests.cc-wrapper.llvmTests.llvmPackages_21.libcxx)
| + lib.optionalString (lib.versionAtLeast release_version "21") '' | ||
| cp -r ${monorepoSrc}/third-party "$out" | ||
| '' |
There was a problem hiding this comment.
This contains vendored code and we should probably add Nixpkgs dependencies instead. However, we do this in other LLVM packages already, so it’s not a blocker.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.