kimai, nixos/kimai: init at 2.24.0 #353187
Merged
Conversation
This file contains 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
github-actions
bot
added
6.topic: nixos
OPNA2608
requested changes
Nov 2, 2024
peat-psuwit
force-pushed
the
for-upstream/kimai
branch
from
bbeb186 to
e162e26
Compare
github-actions
bot
added
the
8.has: maintainer-list (update)
ofborg
bot
added
8.has: package (new)
|
Please rebase on master, x86_64-linux build on ofborg is failing due to missing 2f7b6eb. |
h7x4
added
8.has: module (new)
peat-psuwit
force-pushed
the
for-upstream/kimai
branch
from
e162e26 to
a728c81
Compare
|
Rebased against current master. Please take another look. |
wegank
added
the
2.status: merge conflict
|
Can you resolve the merge conflict? I'll try to give this another review later this week. |
peat-psuwit
force-pushed
the
for-upstream/kimai
branch
from
a728c81 to
d8d2ab1
Compare
|
Rebased and solved conflict. Please have another look. |
ofborg
bot
removed
the
2.status: merge conflict
OPNA2608
added
the
12.approvals: 1
OPNA2608
reviewed
Nov 17, 2024
There was a problem hiding this comment.
Ah, branch-off for 24.11 already happened so this won't make it into 24.11 via the master branch.
Are you fine with this going into stable 25.05 instead? Then please move the changelog entry to the new 25.05 entries file.
Otherwise, we'll need to do a backport of this.
wegank
removed
the
12.approvals: 1
peat-psuwit
force-pushed
the
for-upstream/kimai
branch
from
d8d2ab1 to
986a038
Compare
|
25.05 is OK for me. Changelog is moved to 25.05 entries. |
OPNA2608
added
the
12.approvals: 1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Kimai is a web-based multi-user time-tracking application. Works great for
everyone: freelancers, companies, organizations - everyone can track their
times, generate reports, create invoices and do so much more.
https://www.kimai.org/
The project is built using
buildComposerProjecthelper. The module and the test are written following (primarily) Wordpress and Zoneminder.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.