!UNVBThoJtlIiVwiDjU:nixos.org

Staging

318 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%3Aopen109 Servers

Load older messages


SenderMessageTime
19 Sep 2025
@k900:0upti.meK900Also it probably won't revert cleanly15:22:37
@k900:0upti.meK900Looking ati t15:22:39
@k900:0upti.meK900* Looking at it15:22:40
@emilazy:matrix.orgemily eh? it's the last change to cmake 15:22:51
@k900:0upti.meK900WHY DOES UNBOUND REBUILD HASKELL LIKE HELLO15:22:54
@k900:0upti.meK900As in the revert won't compose cleanly with the PR15:23:13
@emilazy:matrix.orgemilyif you revert that commit then the PR applies cleanly. no?15:23:55
@emilazy:matrix.orgemilybecause that restores the state before the PR got a conflict15:24:03
@emilazy:matrix.orgemilyI'm confused15:24:08
@emilazy:matrix.orgemilyokay so the patch isn't even in a release branch anyway15:24:32
@k900:0upti.meK900Yes but then you have an intermediate broken state15:24:32
@emilazy:matrix.orgemilyso I do have to actually rebase15:24:36
@k900:0upti.meK900Oh great15:24:38
@emilazy:matrix.orgemilyand that throws away all our CMake builds15:24:38
@emilazy:matrix.orgemilylol15:24:40
@k900:0upti.meK900I mean15:24:43
@k900:0upti.meK900I'm also going to merge unbound15:24:49
@k900:0upti.meK900Probably15:24:52
@k900:0upti.meK900Which will also do that15:24:58
@emilazy:matrix.orgemilyI should probably make sure Darwin still bootstraps with the latest CMake changes that I've been reverting to not throw away all my builds 🫠15:26:08
@emilazy:matrix.orgemilyimage.png
Download image.png
15:32:02
@emilazy:matrix.orgemilywtf15:32:03
@emilazy:matrix.orgemilyCMake branching strategy is nuts15:32:05
@k900:0upti.meK900Bold of you to assume they have a strategy15:33:46
@emilazy:matrix.orgemilythey clearly do15:33:54
@emilazy:matrix.orgemilylike15:33:56
@emilazy:matrix.orgemilythere is a release-3.2 branch but it's not an actual branch15:34:08
@emilazy:matrix.orgemily instead it's just the latest merge commit with release-3.2 in the message on the release branch 15:34:17
@emilazy:matrix.orgemilyand its parents correspond to the previous state of that "branch" or whtaever15:34:29
@emilazy:matrix.orgemily* and its parents correspond to the previous state of that "branch" or whatever15:34:38

Show newer messages


Back to Room ListRoom Version: 6