| 24 Mar 2025 |
 ElvishJerricco | Tristan Ross: Hey, I know I'm like... a bunch of months late, but this commit was supposed to only go on release-24.11, not master:
- https://github.com/NixOS/nixpkgs/commit/f49e820f
- https://nixos.github.io/release-wiki/Branch-Off.html#on-the-release-branch
I think we should revert it on master, no?
| 23:07:28 |
 Tristan Ross | In reply to @elvishjerricco:matrix.org
Tristan Ross: Hey, I know I'm like... a bunch of months late, but this commit was supposed to only go on release-24.11, not master:
- https://github.com/NixOS/nixpkgs/commit/f49e820f
- https://nixos.github.io/release-wiki/Branch-Off.html#on-the-release-branch
I think we should revert it on master, no?
Oh, it wasn't? I see it mentions master. I had issues when I ran the git push it mentions because a merge happened in the middle and I think that caused some issues | 23:09:41 |
| ElvishJerricco | yea that release-wiki page has different instructions for the release branch and master | 23:10:24 |
| ElvishJerricco | that commit is the instructions for the release branch | 23:10:31 |
| Tristan Ross | Yeah, I don't fully remember what happened lol | 23:12:42 |
| ElvishJerricco | shall I revert it on master then? | 23:13:22 |
| Tristan Ross | Sure | 23:13:47 |
| ElvishJerricco | https://github.com/NixOS/nixpkgs/pull/392904/files | 23:19:19 |
| ElvishJerricco | * https://github.com/NixOS/nixpkgs/pull/392904 | 23:19:20 |
| ElvishJerricco | Tristan Ross, emily: I wonder if it's actually bad for me to revert the revCount though. I think, as nixpkgs moves forward in time, that number is meant to be monotonic. If, for some reason, anyone has been using it as an ever-increasing version number (even though it was the same number for some 5 or 6 years by 24.11), then this would bring the number down and cause a problem | 23:33:18 |
 emily | probably just leave it increased | 23:33:43 |
