| 19 Sep 2025 |
 emily | I'll fix | 15:20:42 |
| emily | …why does it have a merge conflict with cmake | 15:20:52 |
| emily | what got merged to cmake | 15:20:57 |
 K900 | Anyway I think we send the hook PR | 15:21:00 |
| K900 | Because I don't think anyone is qualified to review it | 15:21:10 |
| emily | we have a couple days, right? | 15:21:10 |
| K900 | Maybe like one | 15:21:17 |
| K900 | There's ~5k linux jobs left in queue | 15:21:37 |
| K900 | From masater | 15:21:40 |
| K900 | * From master | 15:21:41 |
| emily | … | 15:21:41 |
| emily | https://github.com/NixOS/nixpkgs/commit/329d3a931f74b6edc7de4c8229575819ccbcdd94 | 15:21:47 |
| emily | can you just revert this | 15:21:51 |
| emily | ccvcunat | 15:21:59 |
| emily | oh it was in the curl PR | 15:22:09 |
| K900 | You can just revert it in your PR | 15:22:19 |
| emily | I can just rebase over it | 15:22:23 |
| K900 | I guess | 15:22:28 |
| K900 | Also it probably won't revert cleanly | 15:22:37 |
| K900 | Looking ati t | 15:22:39 |
| K900 | * Looking at it | 15:22:40 |
| emily | eh? it's the last change to cmake | 15:22:51 |
| K900 | WHY DOES UNBOUND REBUILD HASKELL LIKE HELLO | 15:22:54 |
| K900 | As in the revert won't compose cleanly with the PR | 15:23:13 |
| emily | if you revert that commit then the PR applies cleanly. no? | 15:23:55 |
| emily | because that restores the state before the PR got a conflict | 15:24:03 |
| emily | I'm confused | 15:24:08 |
| emily | okay so the patch isn't even in a release branch anyway | 15:24:32 |
| K900 | Yes but then you have an intermediate broken state | 15:24:32 |
| emily | so I do have to actually rebase | 15:24:36 |
