build(nix): fix versionCheckHook, update nixpkgs, standardise versions #575
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MattSturgeon
force-pushed
the
update-nix
branch
from
fb2ec8b to
fdf209f
Compare
Configure `nix flake lock` and `nix flake update` to use conventional commits when run with `--commit-lock-file`.
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/3a05eebede89661660945da1f151959900903b6a?narHash=sha256-Ly2fBL1LscV%2BKyCqPRufUBuiw%2BzmWrlJzpWOWbahplg%3D' (2025-02-26)
→ 'github:NixOS/nixpkgs/4c7d90a136071eb8154d6b3fe63b0046de9d4712?narHash=sha256-clj4TsIVqiFfvyu%2Bmfm3s94Y7iOP%2BeRa62wxzLUV49M%3D' (2025-11-30)
Switches from using commit hashes for the package version to using `1.3.0-unstable-YYYY-MM-DD` date-based formatting, as described in: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#versioning
Nixpkgs recently added versionCheckHook to the package we override. versionCheckHook expects `--version` to print the entire package version, and it doesn't provide any way to override the version string it expects without manually setting `version` in `preVersionCheck`. Since the package version uses a different format to the build version, the check fails. Patch it to ignore the -unstable-YY-MM-DD suffix.
While the package uses Nixpkgs compliant `${version}-unstable-${date}`
formatting, the actual build should use PEP-440 compliant
`${version}.dev${date}` formatting.
This makes things like `--version` more useful at runtime.
TODO: consider using unstable versioning in non-nix builds too.
MattSturgeon
force-pushed
the
update-nix
branch
from
fdf209f to
c53e683
Compare
Contributor
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixes a build failure with recent nixpkgs and makes the package versioning clearer.
cc @beh-10257 @LovingMelody
What changed
Configure flake lock commits
nix flake lock/nix flake updatenow use conventional commits when run with--commit-lock-file.Update nixpkgs input
Pulls in the latest nixpkgs, as it hasn't been bumped in a while.
Use date-based versioning
Nix builds now use
1.3.0-unstable-YYYY-MM-DDinstead of commit hashes.This aligns with nixpkgs' version style and enables the next commit fixing
versionCheckHook...The first part is read from
umu/__init__.py, which is the canonical project version.Fix versionCheckHook
Patch ensures the hook passes even though the Python package uses a slightly different version format.
PEP-440 runtime version
Python package
__version__is now${version}.devYYYYMMDD, making the--versionoutput more meaningful.Testing
The nix package can't be built when tests fail, so I initially based this PR on the commit before #293, due to the test suite currently being broken on
main.Sadly, that lead to conflicts, so this is now rebased on
mainand cannot easiliy be tested. One way to test is addingdoCheck = falseto the package. Another way is to rebase on #574 which aims to fix the testsuite.For users
__version__) or via--versionis now PEP-440 compatible and includes a date, e.g.1.3.0.dev20251130.1.3.0-unstable-2025-11-30.