| 5 Jul 2021 |
 hexa | From the python-unstable branch we have a fixup commit that should've been squashed. Can/should we still squash that on staging, or is that too late? | 21:16:02 |
| hexa | Redacted or Malformed Event | 21:16:32 |
| hexa |
a2c9f048495 fixup! python3: 3.8 -> 3.9
| 21:16:51 |
 Vladimír Čunát | I suspect that staging is better kept fast-forward. | 21:28:29 |
| hexa | yeah, I somewhat feel the same, it's no biggie | 21:30:37 |
 jonringer | I don't think it's a major issue. If it was just named doc/python: update python3 references then it would have been fine | 21:52:50 |
| 6 Jul 2021 |
| hexa | another library update incoming, libexr. will be ready in an hour or so. | 14:26:33 |
| hexa | hydra seems somewhat idle, hovering around 20k darwin builds, so we could start another staging-next run | 14:26:51 |
| hexa | I assume you killed the glibc job eval? | 14:27:08 |
| Vladimír Čunát | Yes, I just canceled the glibc-2.33 jobset and merged it into staging. | 14:27:13 |
| hexa | great | 14:27:26 |
| hexa | * another library security update incoming, libexr. will be ready in an hour or so. | 14:27:58 |
| Vladimír Čunát | OK, I assume we'll wait for libexr and then immediately go for the next staging-next. | 14:31:24 |
| hexa | Redacted or Malformed Event | 14:32:06 |
| hexa | * another library security update incoming, openexr. will be ready in an hour or so. | 14:32:52 |
| hexa | https://github.com/AcademySoftwareFoundation/openexr/commit/6442fb71a86c09fb0a8118b6dbd93bcec4883a3c doesn't apply any more, seeing as it wasn't upstreamed 😞 | 16:12:12 |
| hexa | I don't understand enough of cmake to update openexr it seems | 16:18:06 |
| hexa | sorry | 16:18:08 |
 Sandro | It was merged as https://github.com/AcademySoftwareFoundation/openexr/commit/023e879e52e7486c4866ee4a86596314d84b84df | 16:27:51 |
| hexa |
/nix/store/qdf49mvm79r83n9c9s7pkmmjqwhrw8jv-stdenv-linux/setup: line 88: cd: IlmBase: No such file or directory
| 16:31:17 |
| hexa | we are talking over in #security:nixos.org | 16:31:24 |
|  spacesbot - keeps a log of public NixOS channels changed their display name from spacesbot to spacesbot - keeps a log of public NixOS channels. | 22:11:42 |
| 7 Jul 2021 |
| Vladimír Čunát | Merged, and created new staging-next. | 06:49:57 |
| Vladimír Čunát | Nit: I wondered whether the staging -> staging-next merge should be --no-ff. The previous one apparently wasn't, so I did it the same. | 06:50:56 |
| hexa | https://github.com/NixOS/nixpkgs/pull/129506 for reference | 07:33:58 |
| Sandro | In reply to @vcunat:matrix.org
Nit: I wondered whether the staging -> staging-next merge should be --no-ff. The previous one apparently wasn't, so I did it the same. Did you manually merge it or via the website? The website normally shouldn't do a ff IIRC. | 08:31:09 |
| Vladimír Čunát | I typically merge manually, so I can sign it. | 08:31:26 |
| Sandro | I wouldn't want to do that especially when other people do things at the same time | 08:32:16 |
| Vladimír Čunát | Pushes don't happen that often. (though I've ran into a series of r-ryan pushes at least once) | 08:34:00 |
| Vladimír Čunát | and I'm used to easy rebasing of merges. | 08:34:11 |
