Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bacb2e216e35
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c932a74b4a2c
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 21, 2018

  1. pan: 0.139 -> 0.144

    @dtzWill
    dtzWill committed Mar 21, 2018
    Copy the full SHA
    8265979 View commit details

  2. pan: wrap to provide gpg2, which it crashes without 

    Fixes #37556.
    @dtzWill
    dtzWill committed Mar 21, 2018
    Copy the full SHA
    96f0d4e View commit details

  3. pan: ensure features we provide deps for are used, move to gtk3

    @dtzWill
    dtzWill committed Mar 21, 2018
    Copy the full SHA
    7d873b8 View commit details

  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)
    @dtzWill
    dtzWill committed Mar 21, 2018
    Copy the full SHA
    63ba349 View commit details

  5. Merge pull request #37561 from dtzWill/fix/pan-and-update 

    pan: update 0.139 -> 0.144, fix crash on startup, dep and feature wrangling.
    @dtzWill
    dtzWill authored Mar 21, 2018
    Copy the full SHA
    c932a74 View commit details
Showing with 24 additions and 11 deletions.
  1. +23 −8 pkgs/applications/networking/newsreaders/pan/default.nix
  2. +1 −3 pkgs/top-level/all-packages.nix
31 changes: 23 additions & 8 deletions pkgs/applications/networking/newsreaders/pan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,38 @@
{ spellChecking ? true
, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
, perl, pcre, gmime, gettext, intltool, 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.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 ]
++ stdenv.lib.optional spellChecking gtkspell2;
nativeBuildInputs = [ pkgconfig makeWrapper ];
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
'';

enableParallelBuilding = true;

4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };