| 10 Jan 2025 |
 emily | master is periodically merged (via staging-next) into staging, but only every 6 hours, so master usually has commits not on staging (that would show up as "extra" in a staging PR if you used them as a base for your changes) | 16:43:37 |
 Greg Hellings | Ooof, that's going to be a monster to rebase. I took this branch already off of staging, so it's trying to do lots of weird stuff | 16:43:50 |
| emily | by using the newest master commit that's already merged into staging, you get a commit based on something that will have most stuff cached, but that cleanly merges into staging | 16:43:52 |
| emily | so you can test it without mass rebuilds | 16:43:56 |
| emily | probably you just gave it the wrong commit to start with | 16:44:07 |
| Greg Hellings | I'm fairly sure I'm going to have mass rebuilds anyway with where ICU lives in the stack, lulz | 16:46:09 |
| Greg Hellings | So the example in CONTRIBUTING.md is based on the assumption the branch is based off master. Mine isn't, mine is based directly on the staging branch already | 16:47:22 |
| Greg Hellings | So trying to do that rebase onto the merge-base of the two was giving me a massive list of conflicts | 16:47:51 |
 lzcunt | Hey there, regarding https://github.com/NixOS/nixpkgs/pull/370683 I think I have finally fixed the regression but it involves autoreconf-ing gcc, should I just always autoreconf or only when withoutTargetLibc? | 17:01:06 |
| lzcunt | * Hey there, regarding https://github.com/NixOS/nixpkgs/pull/370683 I think I have finally fixed the regression but it involves autoreconf-ing gcc, should I just always autoreconf or only when withoutTargetLibc? Don't bother checking the PR it's not pushed yet | 17:01:43 |
| emily | do you actually depend on changes in staging? | 17:10:16 |
| emily | or do they just happen to be in the stack? | 17:10:19 |
| emily | I think we can't autoreconf GCC in the bootstrap | 17:10:30 |
| emily | because we don't have autoconf when we first build GCC | 17:10:36 |
| emily | not sure though | 17:10:38 |
| lzcunt | oh that would be a shame | 17:11:09 |
| Greg Hellings | Depend on them? Not really. But the master branch still didn't have the darwin.ICU changes when I was working on this last night. Those were in staging | 17:32:37 |
| emily | ah, right | 17:33:48 |
| emily | then base it on staging-next | 17:33:48 |
| emily | which has the Darwin ICU changes but should have more stuff cached by now | 17:33:49 |
| emily | (merge-base of staging-next and staging) | 17:33:50 |
| Greg Hellings | But then my local infrastructure wouldn't have this pleasure:
┏━ Dependency Graph:
┣━━━ Builds │ Downloads
┗━ ∑ ⏵ 0 │ ✔ 0 │ ⏸ 80378 │ ↓ 0 │ ↓ 0 │ ⏸ 116056 │
| 18:47:36 |
| 11 Jan 2025 |
|  @orzklv:matrix.org left the room. | 04:07:39 |
 Lukas(THI) | anyone here ever tried to set up a dev environment with nix for 3ds developement? | 09:34:15 |
|  oak 🏳️🌈♥️ changed their profile picture. | 16:45:14 |
| 12 Jan 2025 |
|  xin left the room. | 09:57:31 |
| 11 Jan 2025 |
| oak 🏳️🌈♥️ removed their profile picture. | 16:46:17 |
| oak 🏳️🌈♥️ set a profile picture. | 16:46:43 |
| 12 Jan 2025 |
| lzcunt | Heyy here's an update on this: I hit a bug in mlibc hopefully soon to be fixed upstream, static musl is still broken and I don't know what to do about it | 11:09:27 |
| lzcunt | It's seemingly the same issue that broke the mlibc static gcc-nolibc build but the same fix doesn't work | 11:09:54 |
