From 5cb13523a4f741bbe529e4bc38c98bbc1f8a1338 Mon Sep 17 00:00:00 2001 From: Andrew Miloradovsky Date: Wed, 13 Feb 2019 22:08:48 +0000 Subject: [PATCH] planner: unstable-2018-03-25 -> unstable-2019-02-14 - the warnings no longer need to be disabled, fixed upstream - enable the Python 2 / PyGTK bindings and plugin, by the way --- pkgs/applications/office/planner/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 7bc02e786e16..d8765d2fa61a 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -7,10 +7,10 @@ , libtool , gnome2 , libxslt -, python +, python2 }: -let version = "unstable-2018-03-25"; +let version = "unstable-2019-02-13"; in stdenv.mkDerivation { name = "planner-${version}"; @@ -19,13 +19,10 @@ in stdenv.mkDerivation { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "planner"; - rev = "2a2bf11d96a7f5d64f05c9053661baa848e47797"; - sha256 = "1bhh05kkbnhibldc1fc7kv7bwf8aa1vh4q379syqd3jbas8y521g"; + rev = "76d31defae4979aa51dd37e8888f61e9a6a51367"; + sha256 = "0lbch4drg6005216hgcys93rq92p7zd20968x0gk254kckd9ag5w"; }; - # planner-popup-button.c:81:2: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations] - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - nativeBuildInputs = with gnome2; [ pkgconfig intltool @@ -44,10 +41,14 @@ in stdenv.mkDerivation { libgnomeui libglade libxslt - python + python2.pkgs.pygtk ]; preConfigure = ''./autogen.sh''; + configureFlags = [ + "--enable-python" + "--enable-python-plugin" + ]; enableParallelBuilding = true;