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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

listmonk: 2.5.1 -> 3.0.0 #286523

Merged
merged 3 commits into from
Mar 6, 2024
Merged

listmonk: 2.5.1 -> 3.0.0 #286523

merged 3 commits into from
Mar 6, 2024

Conversation

MarcelCoding
Copy link
Member

@MarcelCoding MarcelCoding commented Feb 5, 2024 •
edited
Loading

Description of changes

https://github.com/knadh/listmonk/releases/tag/v3.0.0

EDIT:
istmonk switched their frontend toolchain to vite existing past usage of yarn2nix did not work using the new toolchain setup. Therefore, I migrated the derivation to the "normal" yarn2nix.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Add a 馃憤 reaction to pull requests you find important.

@ofborg ofborg bot requested a review from RaitoBezarius February 5, 2024 16:54
@MarcelCoding MarcelCoding mentioned this pull request Feb 17, 2024
Closed
13 tasks
@tanneberger
Copy link
Contributor

@MarcelCoding you probably want to split this single commit into two: 1.) Updating the Package 2.) Fixing the Module

RaitoBezarius
RaitoBezarius previously requested changes Feb 17, 2024
View reviewed changes
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR changes a lot of things, I would like you to split the changes in multiple atomic commits with commit messages explaining why you are doing a particular change. Thank you.

@MarcelCoding
Copy link
Member Author

MarcelCoding commented Feb 17, 2024 •
edited
Loading

I've split the commits into the update and the module fix. I've also documented the motivation behind the changes in the frontend update. (commit message)

Edit: I've tried testing the change, although now there is a problem with the hash of the lockfile, I'll notify you when I resolve it.

@ofborg ofborg bot requested a review from RaitoBezarius February 17, 2024 19:34
@RaitoBezarius
Copy link
Member

I've split the commits into the update and the module fix. I've also documented the motivation behind the changes in the frontend update. (commit message)

Edit: I've tried testing the change, although now there is a problem with the hash of the lockfile, I'll notify you when I resolve it.

That's not sufficient, the update contains much more than simply a update, please split more.

@MarcelCoding
Copy link
Member Author

But like how would I split it?

  • updated Backend
  • updated frontend? Then there are two commits which would be broken without the other one?

@ehmry
Copy link
Contributor

ehmry commented Feb 29, 2024

This is a good time to move to pkgs/by-name/li/listmonk.

@MarcelCoding
listmonk: 2.5.1 -> 3.0.0
333ad51 
listmonk switched their frontend toolchain to vite
the existing past usage of yarn2nix did not work
using the new toolchain setup. Therefore, I
migrated the derivation to the "normal" yarn2nix.
@MarcelCoding
listmonk: ensure correct application of data migration
896a4d6
@MarcelCoding
Copy link
Member Author

I've fixed the broken hash and also moved the package into by-name.

ehmry
ehmry approved these changes Mar 5, 2024
View reviewed changes
Copy link
Contributor

@ehmry ehmry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me.

SuperSandro2000
SuperSandro2000 approved these changes Mar 6, 2024
View reviewed changes
nixos/modules/services/mail/listmonk.nix
@@ -187,7 +187,11 @@ in {
# Indeed, it will try to create all the folders and realize one of them already exist.
# Therefore, we have to create it ourselves.
''${pkgs.coreutils}/bin/mkdir -p "''${STATE_DIRECTORY}/listmonk/uploads"''
"${cfg.package}/bin/listmonk --config ${cfgFile} --idempotent --install --upgrade --yes"
# setup database if not already done
"${cfg.package}/bin/listmonk --config ${cfgFile} --idempotent --install --yes"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could use lib.getExe here

pkgs/by-name/li/listmonk/package.nix

src = fetchFromGitHub {
owner = "knadh";
repo = "listmonk";
rev = "v${version}";
sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I=";
sha256 = "sha256-eNX+2ens+mz2V8ZBHtFFHDVbi64AAiiREElMjh67Dd8=";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could use hash

@SuperSandro2000 SuperSandro2000 merged commit e656679 into NixOS:master Mar 6, 2024
24 checks passed
@MarcelCoding MarcelCoding deleted the listmonk branch March 6, 2024 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehmry ehmry ehmry approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@tanneberger tanneberger tanneberger approved these changes

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@MarcelCoding @tanneberger @RaitoBezarius @ehmry @SuperSandro2000