| 8 Sep 2023 |
tomberek | infinisil: Amazing talk today. Very well done. Bravo! | 22:54:03 |
infinisil | Thanks! ☺️ | 22:55:26 |
infinisil | In reply to @figsoda:matrix.org just implemented the feature in nix-init, I think one thing that would help is if some constants and shard_for_package are exposed in a crate It is internal, but we could maybe just mark it as such. Can you open an issue or a PR to discuss this? | 22:59:40 |
figsoda | In reply to @infinisil:matrix.org It is internal, but we could maybe just mark it as such. Can you open an issue or a PR to discuss this? https://github.com/NixOS/nixpkgs/issues/254122 | 23:06:46 |
figsoda | not much more information aside from what was already said, but this would be a good place to aggregate the discussion | 23:07:27 |
infinisil | figsoda: Can you ping @nixpkgs-architecture/team in the issue so it's going to the teams notifications? That would be great :) | 23:12:53 |
infinisil | Updating it should work | 23:12:58 |
figsoda | updated the issue to ping @nixpkgs-architecture and @nixpkgs-architecture/team since the latter wasn't giving me a preview | 23:15:23 |
infinisil | Ah darn, yeah I think we need to push some people to move the architecture team into the nixos org, because apparently these pings don't work :/ | 23:31:36 |
infinisil | figsoda: So maybe just ping me and @roberth | 23:32:23 |
infinisil | Sorry for the trouble 😅 | 23:32:59 |
figsoda | no worries | 23:37:19 |
| 9 Sep 2023 |
@quantenzitrone:matrix.org | just watched the talk on media.ccc.de
👏👏👏 | 09:20:54 |
| Edward Tjörnhammar joined the room. | 12:37:32 |
| 12 Sep 2023 |
| @cifre:matrix.org joined the room. | 00:44:33 |
@piegames:matrix.org | Just a random idea, what if the automatic migration skipped all packages with open PRs at first to not make any conflicts? Then do one or two more such runs in the hope of catching some more packages, and then the assumption is that everything left is mostly old stuff that is allowed to conflict | 09:03:19 |
@rick:matrix.ciphernetics.nl | I thought the migration would take care of that by giving git enough hints? Or doesn't that work (well enough)? | 10:27:54 |
@piegames:matrix.org | Well yes but it still requires rebasing | 10:28:21 |
@piegames:matrix.org | Not sure how many PRs are even affected, and if it's worth it. Just an idea | 10:28:37 |
infinisil | piegames: Hmm yeah I discussed this before, my main argument for not doing this is the complexity of doing so | 10:32:42 |
@piegames:matrix.org | What complexity? (not rhetorical question) | 10:33:14 |
infinisil | I wonder if it's worth it, because rebase PR's should be fairly quick on an individual basis, whereas implementing this requires searching through all PR's (automated of course), and then adding those to an exception list or something, having to decide when to do it anyways | 10:33:49 |
@piegames:matrix.org | Though I'd be interested in some numbers here, like how many pull requests and how many packages are affected by this anyways? How many of these pull requests are younger than three months? | 10:34:49 |
infinisil | And how many PR's will not have to rebase because of this? I guess the turn-over rate is fairly high, just waiting some weeks probably gets a high percentage | 10:34:56 |
@profpatsch:augsburg.one | piegames: I had the same idea during nixcon, but honestly I think it’s totally feasible to require PRs to be rebased on top of master | 10:35:42 |
@profpatsch:augsburg.one | Since that parallelizes well | 10:35:48 |
Alyssa Ross | presumably we could just use "Rebase and Merge" in the UI, as long as git can tell what's going on? | 10:36:13 |
@profpatsch:augsburg.one | ofc long feature branches might hate that, but they can merge master back into themselves | 10:36:24 |
Alyssa Ross | makes the history (and especially bisects) easier too | 10:36:26 |
@piegames:matrix.org | In reply to @qyliss:fairydust.space presumably we could just use "Rebase and Merge" in the UI, as long as git can tell what's going on? This would be a deviation from us currently having merge commits everywhere. | 10:37:06 |