!UNVBThoJtlIiVwiDjU:nixos.org

Staging

350 Members
Staging merges | Find currently open staging-next PRs: https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+sort%3Aupdated-desc+head%3Astaging-next+head%3Astaging-next-21.05+is%3Aopen115 Servers

Load older messages


SenderMessageTime
26 Sep 2025
@qyliss:fairydust.spaceAlyssa RossThat's true but often there's something I'd do slightly differently, and given I have to test it anyway...19:11:23
@ghpzin:envs.net@ghpzin:envs.net does it include llvmPackages_{18,19} build fixes ?
(provided I don't know if Darwin even builds them with gcc)
19:27:42
@emilazy:matrix.orgemily we don't try to of course 19:30:48
@emilazy:matrix.orgemilyDarwin is LLVM-native19:30:51
@emilazy:matrix.orgemilyand GCC has poor support on Darwin in general19:31:03
@emilazy:matrix.orgemilyit's only really load-bearing via GFortran, and frankly we should move to Flang for that anyway19:31:12
@emilazy:matrix.orgemily but GFortran is load-bearing, so we do need to keep it working 19:31:21
@emilazy:matrix.orgemilywe compile GCC with LLVM19:31:29
@emilazy:matrix.orgemilyI wouldn't be surprised if building LLVM with GCC on Darwin is broken already :) so that's mostly relevant for Linux19:32:03
@ghpzin:envs.net@ghpzin:envs.net Then I guess I will try to PR tomorrow, because llvmPackages_{18,19}.mlir and llvmPackages_18.{lldb,llvm} do not build with gcc15.
I tried to make patches sane, but upstream not backporting and changing include lines between versions made it harder.
19:36:54
@ghpzin:envs.net@ghpzin:envs.net Then I guess I will try to PR tomorrow, because llvmPackages_{18,19}.mlir and llvmPackages_18.{lldb,llvm} do not build with gcc15.
I tried to make patches sane, but upstream not backporting and changing include lines between versions made it harder.
My favorite is that one commit that would apply cleanly if only author did not bundle some bazel file change into same commit with it.
19:39:41
@ghpzin:envs.net@ghpzin:envs.net Then I guess I will try to PR tomorrow, because llvmPackages_{18,19}.mlir and llvmPackages_18.{lldb,llvm} do not build with gcc15.
I tried to make patches sane, but upstream not backporting and changing include lines between versions made it harder.
My favorite is that one patch that would apply cleanly if only author did not bundle some bazel file change into same commit with it.
19:40:05
@grimmauld:grapevine.grimmauld.deGrimmauld (migrated to @grimmauld:m.grimmauld.de) fetchpatch2 { excludes = [ "<bazel file>" ]; } 19:44:33
@emilazy:matrix.orgemily (fetchpatch over fetchpatch2 please) 19:45:06
@grimmauld:grapevine.grimmauld.deGrimmauld (migrated to @grimmauld:m.grimmauld.de)fetchpatch doesn't do excludes though, right?19:45:21
@emilazy:matrix.orgemily(ough, need to revert that docs change once I have more than 0 slack…)19:45:23
@emilazy:matrix.orgemilyit does.19:45:25
@grimmauld:grapevine.grimmauld.deGrimmauld (migrated to @grimmauld:m.grimmauld.de)HUH#19:45:29
@emilazy:matrix.orgemily fetchpatch does basically everything except renames. 19:45:30
@grimmauld:grapevine.grimmauld.deGrimmauld (migrated to @grimmauld:m.grimmauld.de)okay then19:45:50
@samasaur:matrix.orgsamasaur what is the difference between these two. i've been defaulting to fetchpatch2 (higher number is clearly better) 19:45:52
@emilazy:matrix.orgemilyit was meant to be better :(19:45:58
@emilazy:matrix.orgemily fetchpatch2 uses a newer version of the patch-munging program 19:46:04
@emilazy:matrix.orgemilyit handles renames19:46:08
@grimmauld:grapevine.grimmauld.deGrimmauld (migrated to @grimmauld:m.grimmauld.de)fetchpatch2 bad, use fetchpatch if possible19:46:13
@emilazy:matrix.orgemily unfortunately, it does not strip the index … Git lines containing truncated commit hashes 19:46:15
@emilazy:matrix.orgemilyand those change, as repos get bigger19:46:19
@emilazy:matrix.orgemily you need ?full_index=1 to use fetchpatch2 safely with GitHub patches 19:46:28
@emilazy:matrix.orgemilyand some forges don't have an option for it at all19:46:33
@emilazy:matrix.orgemily so unfortunately fetchpatch is usually the better option 19:46:39

Show newer messages


Back to Room ListRoom Version: 6