Skip to content

gnome3.geary: 0.12.4 -> 0.13.1 #56165

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Feb 22, 2019
Merged

gnome3.geary: 0.12.4 -> 0.13.1 #56165

merged 2 commits into from
Feb 22, 2019
+45 −36

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Ends the litany of patches and other horrible things 😄

Link to News

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Feb 21, 2019
@GrahamcOfBorg GrahamcOfBorg 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 on Darwin 10.rebuild-linux: 1-10 labels Feb 21, 2019
@worldofpeace
Copy link
Contributor Author

I think the test failure on aarch might have been reported upstream.

@jtojnar
Copy link
Member

jtojnar commented Feb 22, 2019 •
edited
Loading

I am getting TLS support is not available, we need glib-networking. Also, I got rid of few unnecessary dependencies:

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index d9ca60ddcde..074a9c90f67 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant, wrapGAppsHook, gdk_pixbuf, meson, ninja
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
 , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
-, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext, gobject-introspection
-, libpthreadstubs, sqlite, gcr, json-glib, itstool, libgee, gnome3, librsvg, webkitgtk, python3
-, xvfb_run, dbus, shared-mime-info, libunwind }:
+, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
+, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
+, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }:
 
 stdenv.mkDerivation rec {
   pname = "geary";
@@ -13,15 +13,24 @@
     sha256 = "0h9pf2mdskq7mylib1m9hw86nwfmdzyngjl7ywangqipm1k5svjx";
   };
 
+  patches = [
+    # gobject-introspection is not needed
+    # https://gitlab.gnome.org/GNOME/geary/merge_requests/138
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch;
+      sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk";
+    })
+  ];
+
   nativeBuildInputs = [
-    desktop-file-utils gettext gobject-introspection itstool
+    desktop-file-utils gettext itstool
     libxml2 meson ninja pkgconfig vala wrapGAppsHook python3
   ];
 
   buildInputs = [
-    adwaita-icon-theme enchant gcr gdk_pixbuf gmime gnome-online-accounts
+    adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
     gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
-    libgee libnotify libpthreadstubs librsvg libsecret sqlite webkitgtk
+    libgee libnotify libsecret sqlite webkitgtk glib-networking
     libunwind
   ];

@worldofpeace
Copy link
Contributor Author

Thought enchant defaulted to 2.

Didn't look to see if they actually used gobject-introspection anymore.
Thanks for the patch.

@worldofpeace
gnome3.geary: 0.12.4 -> 0.13.1

Verified

This commit was signed with the committer’s verified signature.
codetheweb Max Isom
GPG key ID: C7631086E1E5F289
Verified
Learn about vigilant mode
7f2e092
@jtojnar
Copy link
Member

jtojnar commented Feb 22, 2019

Thought enchant defaulted to 2.

It does not; not yet. We probably want to go the Arch way and patch the old apps (the API breakage is minor) but I did not have time to do it yet.

Didn't look to see if they actually used gobject-introspection anymore.
Thanks for the patch.

Yeah, I was wondering what would pure Vala app need g-i for. Turns out they used to generate GIR and then Vapi from WebkitGtk headers.

@worldofpeace
Copy link
Contributor Author

Thought enchant defaulted to 2.

It does not; not yet. We probably want to go the Arch way and patch the old apps (the API breakage is minor) but I did not have time to do it yet.

I'll try to open an issue here, should be sprintable, especially since Arch already has patches.

Yeah, I was wondering what would pure Vala app need g-i for. Turns out they used to generate GIR and then Vapi from WebkitGtk headers.

Right, this app has gone through a lot 😄

@worldofpeace
Copy link
Contributor Author

Looks like there was a concern for libunwind

Not sure if we'd need to care about that here.

@worldofpeace
gnome3.geary: fix tests on aarch64

Verified

This commit was signed with the committer’s verified signature.
codetheweb Max Isom
GPG key ID: C7631086E1E5F289
Verified
Learn about vigilant mode
608b79e
@jtojnar
Copy link
Member

jtojnar commented Feb 22, 2019

If it builds on our platforms, I think we are golden.

@worldofpeace worldofpeace merged commit 7ef9879 into NixOS:master Feb 22, 2019
@worldofpeace worldofpeace deleted the bump-geary branch February 22, 2019 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar

@hedning hedning

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@worldofpeace @jtojnar @GrahamcOfBorg