diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/misc')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/geary/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 4625f405c3d..4d649bdfbe9 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -42,13 +42,18 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.38.0.1"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xbhzjn6sp9qj0iqfgq4q25is3wgjz1c090i8y60azgi9hyjkh79"; + sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7"; }; + patches = [ + # Longer timeout for client test. + ./Bump-client-test-timeout-to-300s.patch + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -97,18 +102,6 @@ stdenv.mkDerivation rec { "-Dcontractor=true" # install the contractor file (Pantheon specific) ]; - patches = [ - # https://gitlab.gnome.org/GNOME/geary/-/issues/985 - # drop in 3.38.1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/b5abd3f9664c396ad57f177750973695c58e8b7f.patch"; - sha256 = "zBPhlz8Zujt9tmZrIUkvZSOpD7/UhTeokE9U/704qSE="; - }) - - # Longer timeout for client test. - ./Bump-client-test-timeout-to-300s.patch - ]; - # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa postPatch = '' |