| 23 Sep 2025 |
 vcunat | So staging-next never knew this merge+revert. | 12:49:36 |
| vcunat | i.e. the merge base (for master->staging-next) always seemed like master didn't change anything and staging-next updated it. | 12:50:29 |
 Wolfgang Walther | Ah, that was a misunderstanding on my part, then. | 12:50:40 |
| Wolfgang Walther | I thought this was already in staging-next. | 12:50:47 |
| Wolfgang Walther | But it was what caused the merge conflict and never made it there. | 12:50:55 |
| Wolfgang Walther | After the revert, the state was clean again. | 12:51:00 |
| Wolfgang Walther | (there was never a manual merge) | 12:51:07 |
| vcunat | It is in staging-next now, but there was no auto-merge on the state between merging the PR and reverting it. | 12:51:58 |
| vcunat | * It is in staging-next now, but there was no merge on the state between merging the PR and reverting it. | 12:52:10 |
| Wolfgang Walther | yes. | 12:52:15 |
| Wolfgang Walther | It only came in as merge+revert = no-op. I see. | 12:52:22 |
 K900 | Yeah | 12:52:35 |
| Wolfgang Walther | In any case, the update is already there, so nothing to do for me :D | 12:52:54 |
| vcunat | Rarely you run into such "problems" resulting from the dumbness of 3-way merging. | 12:53:05 |
| vcunat | If the auto-merge timing was different, it would resolve differently. | 12:53:21 |
| vcunat | Or "luckily" it wouldn't merge cleanly because of the fetcher rewrite. | 12:54:31 |
| Wolfgang Walther | exactly | 12:54:43 |
| vcunat | So, when are we switching to pijul? 😆 | 12:58:38 |
 Fabián Heredia | Hi, for cmake 4 I want to pull a patch from sourceforge but I can't seem to find an easy way to do that and seems like other maintainers have opted to inline / commit the patch into a file in nikpkgs. wsid?
https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/ | 15:03:10 |
| Fabián Heredia | * Hi, for cmake 4 I want to pull a patch from sourceforge but I can't seem to find an easy way to do that and seems like other maintainers have opted to inline / commit the patch into a file in nikpkgs. What should I do?
https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/ | 15:03:21 |
| K900 | IMO just vendor it | 15:06:49 |
| K900 | It's three lines who gives a shit | 15:06:52 |
