Merge staging-next into staging

3 files changed, 4 insertions, 56 deletions

diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix
index 28a470162ce..e92d7d64337 100644
--- a/pkgs/applications/office/elementary-planner/default.nix
+++ b/pkgs/applications/office/elementary-planner/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-planner";
-  version = "2.3.5";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planner";
     rev = version;
-    sha256 = "15d51sqb3k59jjishsw1fq5ib50jmhlk194y3nga329damfv8bmy";
+    sha256 = "1q5pf9hnkix68idjd1dari8qlzfniazh8xfszj48d0yibhlr99zx";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index e18a11a7448..092a776ae60 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -5,11 +5,11 @@ let
 in
 buildPythonApplication rec {
   pname = "todoman";
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16brw2zhm5vamffin6qjb0lxjlj3ba40vaficl851nw2xh2mrdhy";
+    sha256 = "1aq7f63bhs9dnwzp15nfr07f2ki6s3lnqfap3b09rhchn6lfznwb";
   };
 
     LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
deleted file mode 100644
index c45562a0c8d..00000000000
--- a/pkgs/applications/office/trytond/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, python2Packages
-, withPostgresql ? true }:
-
-with stdenv.lib;
-
-python2Packages.buildPythonApplication rec {
-  pname = "trytond";
-  version = "4.8.4";
-  src = python2Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "1935045b1b4674de602b4279a9cfd0a14431624a28ccb490234cffecb81fbca7";
-  };
-
-  # Tells the tests which database to use
-  DB_NAME = ":memory:";
-
-  buildInputs = with python2Packages; [
-    mock
-  ];
-  propagatedBuildInputs = with python2Packages; ([
-    dateutil
-    lxml
-    polib
-    python-sql
-    relatorio
-    werkzeug
-    wrapt
-    ipaddress
-
-    # extra dependencies
-    bcrypt
-    pydot
-    python-Levenshtein
-    simplejson
-    cdecimal
-    html2text
-  ] ++ stdenv.lib.optional withPostgresql psycopg2);
-  meta = {
-    description = "The server of the Tryton application platform";
-    longDescription = ''
-      The server for Tryton, a three-tier high-level general purpose
-      application platform under the license GPL-3 written in Python and using
-      PostgreSQL as database engine.
-
-      It is the core base of a complete business solution providing
-      modularity, scalability and security.
-    '';
-    homepage = "http://www.tryton.org/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ udono johbo ];
-  };
-}