diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
commit | b3fcd9375d89060979ce67d13c6714ebc3e1c002 (patch) | |
tree | e5120c8684e77b7b579c5fd348915cecdca66c57 /pkgs/applications/office | |
parent | 3a4658ea04d66e849aa29c1f747ab8becc14949c (diff) | |
parent | 3dc58eda52ef935313cd0418264abd1d30d6b4d3 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/gnucash/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/office/planner/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/office/watson/default.nix | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index feee36b3d74d6..d8fbd4392bdbc 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -43,9 +43,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ dconf ]; - # glib-2.58 deprecrated g_type_class_add_private - # Should probably be removed next version bump - CXXFLAGS = [ "-Wno-deprecated-declarations" ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; patches = [ ./cmake_check_symbol_exists.patch ]; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 687b83948cd18..f454d8830cba0 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -45,6 +45,9 @@ in stdenv.mkDerivation { python2.pkgs.pygtk ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + preConfigure = ''./autogen.sh''; configureFlags = [ "--enable-python" diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 16df0b294c163..7d79d79072a96 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,12 +4,12 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit version; pname = "td-watson"; - sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d"; + sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n"; }; checkPhase = '' |