!UNVBThoJtlIiVwiDjU:nixos.org

Staging

317 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.meK900On the version bump15:20:40
@emilazy:matrix.orgemilyomg it has a fucking15:20:41
@emilazy:matrix.orgemilyyeah15:20:41
@emilazy:matrix.orgemilyI'll fix15:20:42
@emilazy:matrix.orgemily …why does it have a merge conflict with cmake 15:20:52
@emilazy:matrix.orgemily what got merged to cmake 15:20:57
@k900:0upti.meK900Anyway I think we send the hook PR15:21:00
@k900:0upti.meK900Because I don't think anyone is qualified to review it15:21:10
@emilazy:matrix.orgemilywe have a couple days, right?15:21:10
@k900:0upti.meK900Maybe like one15:21:17
@k900:0upti.meK900There's ~5k linux jobs left in queue15:21:37
@k900:0upti.meK900From masater15:21:40
@k900:0upti.meK900* From master15:21:41
@emilazy:matrix.orgemily15:21:41
@emilazy:matrix.orgemilyhttps://github.com/NixOS/nixpkgs/commit/329d3a931f74b6edc7de4c8229575819ccbcdd9415:21:47
@emilazy:matrix.orgemilycan you just revert this15:21:51
@emilazy:matrix.orgemily ccvcunat 15:21:59
@emilazy:matrix.orgemilyoh it was in the curl PR15:22:09
@k900:0upti.meK900You can just revert it in your PR15:22:19
@emilazy:matrix.orgemilyI can just rebase over it15:22:23
@k900:0upti.meK900I guess15:22:28
@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

Show newer messages


Back to Room ListRoom Version: 6