-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draupnir: init at 1.85.1 #222939
Draupnir: init at 1.85.1 #222939
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This successfully builds for me on x86_64-linux and aarch64-linux. I did not try the module.
This should be rebased such that this PR has the following commits (in this order):
- maintainers: add Rory
- lib/licenses: add CSL
- draupnir: init at 1.81.1 (which adds the package with its update script and adds it to the package lists)
- nixos/draupnir: init (which adds the module with the documentation and adds it to the module list)
pkgs/top-level/all-packages.nix
Outdated
@@ -9311,6 +9311,8 @@ with pkgs; | |||
|
|||
mjolnir = callPackage ../servers/mjolnir { }; | |||
|
|||
draupnir = callPackage ../servers/draupnir {}; | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ideally, this would be sorted (in its category), but this is a lost cause by now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any suggestions where I'd put it then?
bfd5cc1
to
66f4bff
Compare
dd94f64
to
a27ac76
Compare
4e9c4bd
to
dc8fd55
Compare
@TheArcaneBrony do you plan to address the review comments, e.g. the one about the license? |
Yes, I just haven't gotten around to it. |
96e4487
to
f4f48f1
Compare
fb484c3
to
7559cef
Compare
@ofborg eval |
7559cef
to
c7140dd
Compare
@ofborg eval |
Yeah, I'm aware it builds, the problem is IFD, which is not allowed in nixpkgs. |
Correct, which has been fixed as of this last commit. |
Please rebase and squash the changes from into the relevant commits. |
3ea69df
to
357884d
Compare
It still conflicts with master. Can you fetch the remote and rebase again? |
Ops I think I messed up something when I tried to push the rebased commits |
I didn't do the merge either... |
Yeah I'm not sure what happened. I was just trying to help @TheArcaneBrony with the rebase. |
GitHub doing GitHub things 😫 Please open a new PR. |
I salvaged and cleaned up the branch over in https://github.com/mweinelt/nixpkgs/tree/draupnir if you want to continue working on that. |
Note that my interest is due to being a member of both the infrastructure and moderation team, and the lack of maintenance on Mjölnir, which we are currently using. It would be awesome to get Draupnir into nixpkgs and set up for our purposes! |
While I'm aware all i needed to do for the most part was rebase on master and re-open the PR, I haven't gotten around to doing so due to some mental health complications. Did you make any changes on your branch? I checked and didn't notice any. |
No, I just squashed the commits that were on top into the relevant commits. |
Ah, that's what @gaykitty had done as well. |
Though, would be interesting if there was a way to specify multiple Matrix accounts and/or preferred contact method in the maintainers list. |
Description of changes
Draupnir is a hardfork of mjolnir. Mjolnir package has been unmaintained due to upstream bugs. This package is mostly a drop-in replacement. This package also uses newer methods of handling dependencies.
Repository can be found at:
https://github.com/the-draupnir-project/Draupnir
Note on testing: package/module was tested in our production environment, works fine as far as it's been used.
Note on replacing mjolnir: Not sure whether this is appropriate, due to general usage of the bot changing. You can however fully automatically migrate from mjolnir to draupnir.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)