lix-project/nixos-module
15
11
Fork 25
Code Issues 11 Pull requests 7 Projects Releases Packages Wiki Activity Actions

unify lix version string between lix and nixos-module #95

Open
commentatorforall wants to merge 1 commit from commentatorforall/unify-version-string into main AGit
pull from: commentatorforall/unify-version-string
merge into: lix-project:main
Conversation 1 Commits 1 Files changed 2 +4 -2
commentatorforall commented 2025-10-03 19:59:26 +00:00
Member
Copy link

Currently lix and nixos-module have slightly diverging version
strings.
This commit fixes this divergence on the nixos-module side of things.
See lix-project/lix#585 for more
information

Currently `lix` and `nixos-module` have slightly diverging version strings. This commit fixes this divergence on the nixos-module side of things. See https://git.lix.systems/lix-project/lix/issues/585 for more information
unify lix version string between lix and nixos-module
Some checks failed
/ build (aarch64-linux) (pull_request) Has been cancelled
Details
/ build (x86_64-linux) (pull_request) Has been cancelled
Details
abf5438765 
Currently `lix` and `nixos-module` have slightly diverging version
strings.
This commit fixes this divergence on the nixos-module side of things.
See lix-project/lix#585 for more
information
commentatorforall commented 2025-10-03 20:00:42 +00:00
Author
Member
Copy link

see also https://gerrit.lix.systems/c/lix/+/4249

see also https://gerrit.lix.systems/c/lix/+/4249
Some checks failed
/ build (aarch64-linux) (pull_request) Has been cancelled
Details
/ build (x86_64-linux) (pull_request) Has been cancelled
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin +refs/pull/95/head:commentatorforall/unify-version-string
git switch commentatorforall/unify-version-string

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff commentatorforall/unify-version-string
git switch commentatorforall/unify-version-string
git rebase main
git switch main
git merge --ff-only commentatorforall/unify-version-string
git switch commentatorforall/unify-version-string
git rebase main
git switch main
git merge --no-ff commentatorforall/unify-version-string
git switch main
git merge --squash commentatorforall/unify-version-string
git switch main
git merge --ff-only commentatorforall/unify-version-string
git switch main
git merge commentatorforall/unify-version-string
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: lix-project/nixos-module#95
No description provided.
Delete branch "commentatorforall/unify-version-string"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?