lib.version: change pre-git to post-git on the release branch #86313
Conversation
When there is no .version-suffix file in nixpkgs (like when fetching nixpkgs with builtins.fetchGit), lib.version suffixes the version string with "pre-git". The "pre" bit is special cased in builtins.compareVersions which means "20.03pre-git" is interpreted as "less than 20.03". This is clearly wrong for the release-20.03 branch *after* the release has been made. Change the suffix to "post-git" to make code like this behave the same whether nixpkgs is fetched from git or the channel (which has .version-suffix file): lib.versionOlder lib.version "20.03" lib.versionAtLeast lib.version "20.03" (Currently the result depend on how nixpkgs was obtained!) This change should be made part of the release process.
|
Hm, I see now https://nixos.org/nixpkgs/manual/ has the version string "20.03pre-git". Didn't it use to get built with proper version info? |
|
Is the release process documented somewhere? I think it'd be nice to add "set pre-git to post-git" as a step there. |
|
@samueldr sorry for the ping. It seems even if there's a recording saying you're "the other samuel" there's still room for confusion 😁 |
|
@worldofpeace: Ah, thanks to #86368 I see the document is here. |
|
How about having something like |
|
@infinisil Sounds good. Something to add later? Right now I just want to make my config compatible with NixOS 20.03 and 19.09 and I'm somewhat blocked by this. |
|
Merging in 24 hours. |
Motivation for this change
When there is no .version-suffix file in nixpkgs (like when fetching
nixpkgs with builtins.fetchGit), lib.version suffixes the version string
with "pre-git". The "pre" bit is special cased in
builtins.compareVersions which means "20.03pre-git" is interpreted as
"less than 20.03". This is clearly wrong for the release-20.03 branch
after the release has been made.
Change the suffix to "post-git" to make code like this behave the same
whether nixpkgs is fetched from git or the channel (which has
.version-suffix file):
(Currently the result depend on how nixpkgs was obtained!)
This change should be made part of the release process.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)CC @worldofpeace @disassembler (release managers for NixOS 20.03)