Skip to content
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

Merged
merged 0 commits into from
Nov 30, 2023
Merged

Draupnir: init at 1.85.1 #222939

merged 0 commits into from
Nov 30, 2023

Conversation

TheArcaneBrony
Copy link
Contributor

@TheArcaneBrony TheArcaneBrony commented Mar 24, 2023

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
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 24, 2023
lib/licenses.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@apfelkuchen6 apfelkuchen6 left a 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):

  1. maintainers: add Rory
  2. lib/licenses: add CSL
  3. draupnir: init at 1.81.1 (which adds the package with its update script and adds it to the package lists)
  4. nixos/draupnir: init (which adds the module with the documentation and adds it to the module list)

pkgs/servers/draupnir/default.nix Outdated Show resolved Hide resolved
pkgs/servers/draupnir/default.nix Outdated Show resolved Hide resolved
pkgs/servers/draupnir/default.nix Outdated Show resolved Hide resolved
pkgs/servers/draupnir/default.nix Outdated Show resolved Hide resolved
pkgs/servers/draupnir/update.sh Outdated Show resolved Hide resolved
pkgs/servers/draupnir/update.sh Outdated Show resolved Hide resolved
@@ -9311,6 +9311,8 @@ with pkgs;

mjolnir = callPackage ../servers/mjolnir { };

draupnir = callPackage ../servers/draupnir {};

Copy link
Contributor

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.

Copy link
Contributor Author

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?

pkgs/servers/draupnir/test-build.sh Outdated Show resolved Hide resolved
@TheArcaneBrony TheArcaneBrony force-pushed the master branch 3 times, most recently from bfd5cc1 to 66f4bff Compare May 26, 2023 10:24
@TheArcaneBrony TheArcaneBrony force-pushed the master branch 2 times, most recently from dd94f64 to a27ac76 Compare May 31, 2023 18:19
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 13, 2023
@github-actions github-actions bot added the 6.topic: lib The Nixpkgs function library label Jul 14, 2023
@TheArcaneBrony TheArcaneBrony force-pushed the master branch 3 times, most recently from 4e9c4bd to dc8fd55 Compare September 14, 2023 07:52
@alyssais
Copy link
Member

@TheArcaneBrony do you plan to address the review comments, e.g. the one about the license?

@TheArcaneBrony
Copy link
Contributor Author

Yes, I just haven't gotten around to it.

@TheArcaneBrony TheArcaneBrony force-pushed the master branch 2 times, most recently from fb484c3 to 7559cef Compare November 22, 2023 09:23
@mweinelt
Copy link
Member

@ofborg eval

@TheArcaneBrony
Copy link
Contributor Author

@ofborg eval

@TheArcaneBrony
Copy link
Contributor Author

Meanwhile, can confirm this builds and runs on my system:
Screenshot from 2023-11-29 15-14-02

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Nov 29, 2023
@mweinelt
Copy link
Member

Yeah, I'm aware it builds, the problem is IFD, which is not allowed in nixpkgs.

@TheArcaneBrony
Copy link
Contributor Author

Correct, which has been fixed as of this last commit.

@mweinelt
Copy link
Member

Please rebase and squash the changes from

draupnir: Add recommended change

into the relevant commits.

@mweinelt
Copy link
Member

It still conflicts with master. Can you fetch the remote and rebase again?

@gaykitty gaykitty closed this Nov 30, 2023
@wegank wegank merged commit 74afca4 into NixOS:master Nov 30, 2023
10 of 13 checks passed
@gaykitty
Copy link
Contributor

Ops I think I messed up something when I tried to push the rebased commits

@wegank
Copy link
Member

wegank commented Nov 30, 2023

I didn't do the merge either...

@gaykitty
Copy link
Contributor

Yeah I'm not sure what happened. I was just trying to help @TheArcaneBrony with the rebase.

@mweinelt
Copy link
Member

mweinelt commented Nov 30, 2023

GitHub doing GitHub things 😫

Please open a new PR.

@mweinelt
Copy link
Member

mweinelt commented Dec 8, 2023

I salvaged and cleaned up the branch over in https://github.com/mweinelt/nixpkgs/tree/draupnir if you want to continue working on that.

@mweinelt
Copy link
Member

mweinelt commented Dec 9, 2023

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!

@TheArcaneBrony
Copy link
Contributor Author

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.

@mweinelt
Copy link
Member

mweinelt commented Dec 9, 2023

No, I just squashed the commits that were on top into the relevant commits.

@TheArcaneBrony
Copy link
Contributor Author

Ah, that's what @gaykitty had done as well.
I think the flake/module is ready to be merged? I can't think of anything that needs to be changed.
Feel free to make the PR and merge if you think it's ready.

@TheArcaneBrony
Copy link
Contributor Author

Though, would be interesting if there was a way to specify multiple Matrix accounts and/or preferred contact method in the maintainers list.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: lib The Nixpkgs function library 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.