From 8265979114071ebdc633f663a6bdb0deb0b0b8fc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 21 Mar 2018 07:33:50 -0500 Subject: [PATCH 1/4] pan: 0.139 -> 0.144 --- pkgs/applications/networking/newsreaders/pan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index ad35c49c014..42788cfe1a5 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,22 +1,22 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null -, perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify +, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify }: assert spellChecking -> gtkspell2 != null; -let version = "0.139"; in +let version = "0.144"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz"; + sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ] + buildInputs = [ gtk2 perl gmime gettext intltool itstool libxml2 dbus-glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; From 96f0d4e98cd0be7c05b4b2d0a3a6d8db2c6726c5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 21 Mar 2018 07:44:40 -0500 Subject: [PATCH 2/4] pan: wrap to provide gpg2, which it crashes without Fixes #37556. --- pkgs/applications/networking/newsreaders/pan/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 42788cfe1a5..34e24823e46 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,6 +1,7 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null , perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify +, makeWrapper, gnupg }: assert spellChecking -> gtkspell2 != null; @@ -15,10 +16,14 @@ stdenv.mkDerivation { sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 perl gmime gettext intltool itstool libxml2 dbus-glib libnotify ] + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 dbus-glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell2; + postInstall = '' + wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin + ''; + enableParallelBuilding = true; meta = { From 7d873b8fd245aff7ef8dc41863a6c86e3e8fb8d5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 21 Mar 2018 08:45:47 -0500 Subject: [PATCH 3/4] pan: ensure features we provide deps for are used, move to gtk3 --- .../networking/newsreaders/pan/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 34e24823e46..1d913118433 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,10 +1,11 @@ { spellChecking ? true -, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null -, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify +, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null +, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls , makeWrapper, gnupg +, gnomeSupport ? true, libgnome-keyring3 }: -assert spellChecking -> gtkspell2 != null; +assert spellChecking -> gtkspell3 != null; let version = "0.144"; in @@ -17,8 +18,17 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 dbus-glib libnotify ] - ++ stdenv.lib.optional spellChecking gtkspell2; + buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ] + ++ stdenv.lib.optional spellChecking gtkspell3 + ++ stdenv.lib.optional gnomeSupport libgnome-keyring3; + + configureFlags = [ + "--with-dbus" + "--with-gtk3" + "--with-gnutls" + "--enable-libnotify" + ] ++ stdenv.lib.optional spellChecking "--with-gtkspell" + ++ stdenv.lib.optional gnomeSupport "--enable-gkr"; postInstall = '' wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin From 63ba3490de0ddeb9b2b64c0c316cc6d9756ef04a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 21 Mar 2018 10:18:21 -0500 Subject: [PATCH 4/4] pan: enable spell-checking features by default Seems to work, not sure why disabled. Steps are something like: * install dictionaries into profile * attempt to compose a message * (navigate dialogs about server and posting profile) * enable spell-checking from edit->checkbox (note this toggle is avail even when pan can't spellcheck) --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbd82e2a875..77e68001373 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17023,9 +17023,7 @@ with pkgs; ncpamixer = callPackage ../applications/audio/ncpamixer { }; - pan = callPackage ../applications/networking/newsreaders/pan { - spellChecking = false; - }; + pan = callPackage ../applications/networking/newsreaders/pan { }; panotools = callPackage ../applications/graphics/panotools { };