diff options
author | ajs124 <ajs124@users.noreply.github.com> | 2021-07-13 01:09:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-13 01:09:12 +0200 |
commit | 057515d569de49287277a1c3920e9a4902becb14 (patch) | |
tree | 68dad8a083d2c8fa6b5041b2d97da58c4ab1be51 | |
parent | 069a093fab9d9e6a1af0bff8a0a3f8f96e62c10d (diff) | |
parent | 26f52bf6b5d32ebdfc799a6cefc0c1d37700b67a (diff) | |
download | nixpkgs-057515d569de49287277a1c3920e9a4902becb14.tar nixpkgs-057515d569de49287277a1c3920e9a4902becb14.tar.gz nixpkgs-057515d569de49287277a1c3920e9a4902becb14.tar.bz2 nixpkgs-057515d569de49287277a1c3920e9a4902becb14.tar.lz nixpkgs-057515d569de49287277a1c3920e9a4902becb14.tar.xz nixpkgs-057515d569de49287277a1c3920e9a4902becb14.tar.zst nixpkgs-057515d569de49287277a1c3920e9a4902becb14.zip |
Merge pull request #129833 from oxzi/claws-mail-3.18.0_4.0.0
claws-mail: 3.17.8 -> 4.0.0
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 8 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/claws-mail/default.nix | 29 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
5 files changed, 34 insertions, 11 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index da046e62bfb..53c1a18a507 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -523,6 +523,14 @@ <literal>rxvt-unicode</literal> explicitly. </para> </listitem> + <listitem> + <para> + The <literal>claws-mail</literal> package now references the + new GTK+ 3 release branch, major version 4. To use the GTK+ 2 + releases, one can install the + <literal>claws-mail-gtk2</literal> package. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5ae9a5ccfd7..ad56b5cd7d7 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -127,3 +127,5 @@ In addition to numerous new and upgraded packages, this release has the followin However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs. - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly. + +- The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index e28680c245f..5090b1fd027 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex +{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex , curl, gtk2, gtk3, pkg-config, python2, python3, shared-mime-info , glib-networking, gsettings-desktop-schemas -# Use the experimental gtk3 branch. -, useGtk3 ? false +# Selector between the GTK+ 3 and GTK+ 2 releases. +, useGtk3 # Package compatibility: old parameters whose name were not directly derived , enablePgp ? true @@ -57,16 +57,15 @@ with lib; let - version = if useGtk3 then "3.99.0" else "3.17.8"; + # Last release and hash for both the GTK+ 3 and GTK+ 2 version. + version = if useGtk3 then "4.0.0" else "3.18.0"; - # The official release uses gtk2 and contains the version tag. gtk2src = { - sha256 = "0l4f8q11iyj8pi120lrapgq51k5j64xf0jlczkzbm99rym752ch5"; + sha256 = "1vsiy3xsppw4d8ylsz70wsyrvmgy88lp2hj7vrc353ckny80r9lh"; }; - # The corresponding commit in the gtk3 branch. gtk3src = { - sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k"; + sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn"; }; python = if useGtk3 then python3 else python2; @@ -125,7 +124,19 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ ./mime.patch ]; + patches = [ + ./mime.patch + + # Fixes a bug with the automatic authentication method, resulting in errors + # with certain mail providers. + # <https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4497> + # This MUST be removed for the next release. + (fetchpatch { + name = "fix-automatic-auth.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=9c2585c58b49815a0eab8d683f0a94f75cbbe64e"; + sha256 = "0v8v5q2p4h93lp7yq3gnlvarsrcssv96aks1wqy3187vsr4kdw7a"; + }) + ]; preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0df082ff35c..2bc734dc48f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -129,6 +129,7 @@ mapAliases ({ clang12Stdenv = lowPrio llvmPackages_12.stdenv; clangAnalyzer = clang-analyzer; # added 2015-02-20 + claws-mail-gtk3 = claws-mail; # added 2021-07-10 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bcb72235b2..254651a4f5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23294,10 +23294,11 @@ in cipher = callPackage ../applications/misc/cipher { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { + claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; + useGtk3 = false; }; - claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail { + claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; useGtk3 = true; }; |