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

claws-mail{,-gtk3}: refactor and merge #113663

Merged
merged 3 commits into from
Feb 21, 2021
Merged

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Feb 19, 2021

Motivation for this change

This picks up where #100143 left off

@oxzi should I remove (or rather, not add) you from maintainers, while I'm at it, since you're not using claws anymore?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

oxzi and others added 2 commits February 19, 2021 01:23
Update Claws Mail to its latest version and perform a major refactoring.

Previously, the configurable arguments were neither complete nor named
according to the configure.ac file. Likewise, the values did not
correspond to the defaults, but rather to a personal preference.

This has now been changed to enable the arguments which are enabled in
the configure.ac file. Also the variable names have been adjusted. For
compatibility the old parameters also exist.

Next to the claws-mail package is the "experimental" claws-mail-gtk3
package for the non official gtk3 git branch. This package started as an
almost one-to-one copy of the claws-mail derivation which small
modifications. This package was of course not updated.

This has also been changed so that both packages are built from the same
derivative.
@ofborg ofborg bot requested review from oxzi, fpletz and globin February 19, 2021 01:03
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Feb 19, 2021
@ajs124 ajs124 changed the title claws-mail{,-gtk}: refactor and merge claws-mail{,-gtk3}: refactor and merge Feb 19, 2021
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 113663 run on x86_64-linux 1

2 packages built:
  • claws-mail
  • claws-mail-gtk3

claws-mail: Ask if output path lib (3.0M) could be split with outputs = [ ... "lib" ];
claws-mail-gtk3: Ask if output path lib (3.0M) could be split with outputs = [ ... "lib" ];

Copy link
Member

@oxzi oxzi left a comment

Choose a reason for hiding this comment

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

Thank you very much for continuing this Pull Request, I really appreciate it!

I have successfully build both packages and tested them to some extent. Everything seems to work. However, I added one comment regarding the version of the GTK3 tag.

Feel free to leave me on the maintainer list if you like, as I still use Claws as my backup mail client. Thanks again!

outputs = [ "out" "dev" ];
# The corresponding commit in the gtk3 branch.
gtk3src = {
rev = "3.99.0";
Copy link
Member

Choose a reason for hiding this comment

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

This one bugs me a little due to the fact that the special 3.99 tag is not the GTK3 equivalent of the 3.17.8 release. Furthermore, a tagged GTK3 version is new and, as far as I read the mailing list correctly, the 3.99.x (?) releases will be used until version 4.0 is ready.

So maybe the two packages should both use their git tag as versions, claws-mail with 3.17.8 and claws-mail-gtk3 with 3.99.0?

Copy link
Member Author

@ajs124 ajs124 Feb 19, 2021

Choose a reason for hiding this comment

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

I only chose that rev, because it's already on master since 2341270

Switching the version for -gtk3 is probably not a bad idea, yes.

@ofborg ofborg bot requested a review from oxzi February 19, 2021 17:06
Copy link
Member

@oxzi oxzi left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks!

@ajs124 ajs124 merged commit 60450f6 into NixOS:master Feb 21, 2021
@ajs124 ajs124 deleted the claws branch February 21, 2021 18:16
orivej added a commit to orivej/nixpkgs that referenced this pull request Mar 2, 2021
It was inadvertently disabled by NixOS#113663.
orivej-nixos pushed a commit that referenced this pull request Mar 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants