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
thunderbird: rewrite (68.2.2 -> 68.3.0) #75328
Conversation
50ef590
to
6a57758
Compare
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
6a57758
to
63866c3
Compare
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.
Still building over here.
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
Before merging I want to take some of the changes of #55026 and integrate them here. |
29fbb89
to
9144cef
Compare
It'd be cool to also integrate the code style from there, in particular one item per line in arrays. |
9144cef
to
b392052
Compare
@worldofpeace Done, I left the arrays as-is because I don't like the 1/line look, if I must I will change it. I simplified the I mean the "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3${lib.optionalString waylandSupport "-wayland"}" else "2"}" line. |
You could put it in
This also reminds me that |
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
b392052
to
38feec5
Compare
@worldofpeace Not sure why the eval is borked |
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
38feec5
to
601b08d
Compare
I've been using current state (601b08d0) for a couple hours, and it seems fine. (But I haven't really looked at the code, so far.) |
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.
I did leave some comments. Mostly about style and due diligence on catching up with our comments in the expression.
I am not a Thunderbird user so I didn't test this.
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
I agree the style does have some advantages, but to me it takes a bit too much space typically and I personally prefer to group them a bit. BTW, that PR did this only for In any case, I don't care much and I want to avoid spending noticeable amount of time on bikeshedding discussions. |
How about I just |
0913a9c
to
634efa4
Compare
I think that will get us into a funny position. At least for Firefox it treats each new binary location as an incompatible install of Firefox and thus refuses to reuse your existing profiles. That is why those are in there. If you recompile the package with a few bits flipped you should be able to reproduce that. |
Yeah, this happens to be how we've chosen to go about things in gnome expressions. |
I believe I did encounter some issues with thunderbird refusing to "downgrade" or something like that, at least when switching testing of -bin and compiled variant (even though my version never decreased). That was just before we merged some of these variables IIRC (several weeks ago?)
Yes, but regardless of this I personally want to use tools that nicely highlight smaller changes on longer lines. (For non-nix code, for example.) |
634efa4
to
a8d50dd
Compare
I reverted the changes around legacy profiles for the time being, if they complain during the standardization process we can revisit this. @worldofpeace, @vcunat, @andir: This is ready for a last look and merge. |
pkgs/applications/networking/mailreaders/thunderbird/default.nix
Outdated
Show resolved
Hide resolved
a8d50dd
to
76d07cf
Compare
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.
Builds and executes. LGTM.
@lovesegfault Could you document all the notable changes in the commit msg? |
@worldofpeace on it :) |
76d07cf
to
262610e
Compare
@worldofpeace done! |
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.
Looks good. No more complains from my side (for now ;)).
@worldofpeace once you are happy with functionality/testing/reviews feel free to merge. Nothing against it from my side. Just do not use use it so testing it would be kinda silly... |
262610e
to
c62e086
Compare
This is a large scale rework of the package, here's a change summary: * Organized inputs (1/line, except conditionals) * Introduced alsaSupport, pulseaudioSupport, waylandSupport * enableGTK3 -> gtk3Support * enableCalendar -> calendarSupport * Organized buildInputs, nativeBuildInputs (1/line) * Corrected native/buildInputs separation * Ported over fixes/changes from Firefox * Enabled sound, webp, vpx, rust-SIMD, necko-wifi * Removed manual wrapping * Lifted makeDesktopItem out of string section, into Nix * Correctly set bindgen options * Added lovesegfault as maintainer * New url which uses https This is non-authoritative, look at the diff for further info.
c62e086
to
8b8458a
Compare
Pushed silly nitpicks and the new homepage https://www.thunderbird.net/en-US/ |
Thanks a lot @lovesegfault 🌠 |
(cherry picked from commit 3d81015 from #75328) https://www.thunderbird.net/en-US/thunderbird/68.3.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2019-38/ I've been using also this commit for yet another few hours.
Thanks everyone for helping me push this through :) |
Motivation for this change
This supersedes #75143, adding Wayland support, bumping to 68.3.0, and also reworking the build a bit.
The reason for reworking is I noticed the Firefox and Thunderbird builds had gone astray, and since they are almost identical, we ought to try and keep them as much in sync as possible.
I would appreciate @andir taking a look at this since he maintains Firefox and probably has some insights into it.
I've also added myself as a maintainer of the package.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @edolstra @nbp