| 4 Jun 2024 |
 Arian | Also added https://github.com/NixOS/nixpkgs/pull/317261 so we get automatically tagged for review in the future | 18:56:41 |
 m1cr0man | Thank you 🙂. Okay, I can review those. Possibly right now | 18:57:33 |
| Arian | The backport failed to due a merge conflict and my git foo is not good enough. Help would be appreciated https://github.com/NixOS/nixpkgs/pull/317257#issuecomment-2148339873 | 20:13:59 |
| Arian | it's late here and my brain is fried :') | 20:14:14 |
 Sandro 🐧 | git checkout release-24.11 -b backport-xxxx
git cherry-pick hash
vim file/path
fix the issue
git add file/path
git cherry-pick --continue
git push
| 20:36:47 |
| Sandro 🐧 | * git checkout release-24.11 -b backport-xxxx
git cherry-pick hash
vim file/path
# fix the issue
git add file/path
git cherry-pick --continue
git push
| 20:36:58 |
| Sandro 🐧 | and yeah, that PR should be backported 🙂 | 20:37:37 |
| m1cr0man | In reply to @sandro:supersandro.de
git checkout release-24.11 -b backport-xxxx
git cherry-pick hash
vim file/path
# fix the issue
git add file/path
git cherry-pick --continue
git push
Huh, did not know you could check out a ref with -b at the same time. I always checkout then checkout again 😜 | 20:54:34 |
| Sandro 🐧 | In reply to @m1cr0man:m1cr0man.com
Huh, did not know you could check out a ref with -b at the same time. I always checkout then checkout again 😜 TYL | 22:01:39 |
| 5 Jun 2024 |
| Arian | all done! thanks all | 06:37:01 |
 Stéphan | Arian: Thanks for carrying the PR through. I'm in the middle of a move, so couldn't respond in time. 🙂 | 08:07:45 |
| 7 Jun 2024 |
|  @alex3829:matrix.org removed their display name real_z2. | 23:44:21 |
| 24 Jun 2024 |
|  @janik0:matrix.org left the room. | 13:05:57 |
| 29 Jun 2024 |
|  mib 🥐 joined the room. | 22:24:48 |
| 2 Jul 2024 |
 osnyx (he/him) | Hey, any progress on https://github.com/NixOS/nixpkgs/pull/318818? The tests now pass. | 20:59:58 |
 emily | is the aarch64 failure just flakiness? | 21:03:10 |
| osnyx (he/him) | Good question, I don't have the hardware. I can see whether I can re-trigger the ofborg test. But I can say that the test failure is not in the subtest I've touched, but much earlier. | 21:36:01 |
| osnyx (he/him) | I'm using ofborg far too rarely, is it possible to call the test just for a specific platform? | 21:38:24 |
| emily | I think just asking it to run all the tests is fine, although I forget if it'll do it with no changes or not | 21:39:11 |
| emily | FWIW https://github.com/NixOS/aarch64-build-box https://nix-community.org/community-builder/ – if you want access to aarch64-{linux,darwin} builders | 21:39:32 |
| emily | ofborg is happy now and the test seems reasonable | 22:43:53 |
| emily | I don't have commit bit though so I can't merge | 22:44:00 |
| emily | (which is starting to seem a bit silly) | 22:44:24 |
| 3 Jul 2024 |
 [0x4A6F] | In reply to @os:matrix.flyingcircus.io
Hey, any progress on https://github.com/NixOS/nixpkgs/pull/318818? The tests now pass. darwin is fine as usual. Still waiting for x86_64-darwin and aarch64-darwin is happy as ever:
error: a 'aarch64-linux' with features {} is required to build '/nix/store/k5n5x2r0r7hg0zv02favlik1n6d12kjr-append-initrd-secrets.drv', but I am a 'aarch64-darwin' with features {benchmark, big-parallel, nixos-test}
| 07:43:02 |
| Sandro 🐧 | Darwin will always fail. Can be ignored here | 08:41:46 |
| Sandro 🐧 | Merged | 08:43:17 |
| 4 Jul 2024 |
|  Philip Taron (UTC-8) joined the room. | 15:56:07 |
|  Benedikt changed their display name from Soispha to Benedikt. | 19:11:20 |
| 16 Jul 2024 |
| @alex3829:matrix.org left the room. | 23:17:05 |
| 23 Jul 2024 |
|  Ezzobir Bezziou joined the room. | 08:22:45 |
