BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnome.geary: 40.0 → 43.0

Browse source 
https://gitlab.gnome.org/GNOME/geary/-/compare/40.0...43.0

gnome.geary: 40.0 → 43.0

https://gitlab.gnome.org/GNOME/geary/-/compare/gnome-40.0...43.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Jan Tojnar 2022-09-30 16:31:42 +00:00
parent 226d9e02d1
commit df76d94d4a
1 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkgs/desktops/gnome/misc/geary/default.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, pkg-config , pkg-config
, gtk3 , gtk3
, vala , vala
@ -48,43 +47,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "geary"; pname = "geary";
version = "40.0"; version = "43.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c=";
}; };
patches = [
# Fix accessibility issues with initializer of constants (Fix build with vala 0.56)
# https://gitlab.gnome.org/GNOME/geary/-/merge_requests/720
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.patch";
sha256 = "sha256-mSms0MOfw8xHxOrEQwrIv+d4h01xLPgyvX2oWmmFQVw=";
})
# Util.Cache.Lru: Workaround missing generic type argument (Fix build with vala 0.56)
# https://gitlab.gnome.org/GNOME/geary/-/merge_requests/721
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch";
sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI=";
})
# Remove libsoup2 dependency.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/1c1912d0061bb59525b870767d08b16c09acc8da.patch";
sha256 = "TIL7scp4LGAKJ3kmWEHHwIABQTHpOFSmtPom4MkMKtk=";
})
# Prevent libsoup2 × libsoup3 conflict.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/796845aaa7148076132af0ff074e9218d0c3f8b8.patch";
sha256 = "6ZLa8A75RpsXEVMb9bNUiXJSnOvBI1EOok4xzt5m9HU=";
excludes = [
"org.gnome.Geary.json"
];
})
];
nativeBuildInputs = [ nativeBuildInputs = [
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
@ -142,12 +111,9 @@ stdenv.mkDerivation rec {
# NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
# https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa
postPatch = '' postPatch = ''
chmod +x build-aux/post_install.py build-aux/git_version.py chmod +x build-aux/git_version.py
patchShebangs build-aux/post_install.py build-aux/git_version.py patchShebangs build-aux/git_version.py
chmod +x build-aux/yaml_to_json.py
patchShebangs build-aux/yaml_to_json.py
chmod +x desktop/geary-attach chmod +x desktop/geary-attach
''; '';