From e4a535afb9e384f836213b8730effb87d3ccfc0a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 6 Nov 2017 20:56:48 +0000
Subject: [PATCH 1/3] Revert "pythonpackages.redNotebook: Remove outdated
 package"

This reverts commit 33a56ef0a68cc06298556d866b24f1f2a8286639.
---
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d76c836734c..e8b8bf44036 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22735,6 +22735,29 @@ EOF
     };
   };
 
+
+  redNotebook = buildPythonPackage rec {
+    name = "rednotebook-1.8.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://sourceforge/rednotebook/${name}.tar.gz";
+      sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn";
+    };
+
+    # no tests available
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [ pygtk pywebkitgtk pyyaml chardet ];
+
+    meta = {
+      homepage = http://rednotebook.sourceforge.net/index.html;
+      description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ tstrobel ];
+    };
+  };
+
+
   uncertainties = callPackage ../development/python-modules/uncertainties { };
 
   funcy = buildPythonPackage rec {

From 2b8d48a9fc82b3e70a4402828cac6603dead937c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 6 Nov 2017 23:20:14 +0000
Subject: [PATCH 2/3] rednotebook: move to applications/editors

---
 .../editors/rednotebook/default.nix           | 22 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +------------------
 2 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/applications/editors/rednotebook/default.nix

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
new file mode 100644
index 00000000000..ed4b1636305
--- /dev/null
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchurl, pygtk, pywebkitgtk, pyyaml, chardet }:
+
+buildPythonPackage rec {
+  name = "rednotebook-1.8.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/rednotebook/${name}.tar.gz";
+    sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn";
+  };
+
+  # no tests available
+  doCheck = false;
+
+  propagatedBuildInputs = [ pygtk pywebkitgtk pyyaml chardet ];
+
+  meta = with lib; {
+    homepage = http://rednotebook.sourceforge.net/index.html;
+    description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tstrobel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8b8bf44036..da7fae5f904 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22735,28 +22735,7 @@ EOF
     };
   };
 
-
-  redNotebook = buildPythonPackage rec {
-    name = "rednotebook-1.8.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/rednotebook/${name}.tar.gz";
-      sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn";
-    };
-
-    # no tests available
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ pygtk pywebkitgtk pyyaml chardet ];
-
-    meta = {
-      homepage = http://rednotebook.sourceforge.net/index.html;
-      description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ tstrobel ];
-    };
-  };
-
+  redNotebook = callPackage ../applications/editors/rednotebook { };
 
   uncertainties = callPackage ../development/python-modules/uncertainties { };
 

From b48d954228e270ea041fbc674f742295d58478fc Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 6 Nov 2017 23:45:57 +0000
Subject: [PATCH 3/3] rednotebook: 1.8.1 -> 2.3

---
 .../editors/rednotebook/default.nix           | 35 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index ed4b1636305..1a0e6e54fb3 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -1,22 +1,37 @@
-{ lib, buildPythonPackage, fetchurl, pygtk, pywebkitgtk, pyyaml, chardet }:
+{ lib, buildPythonApplication, fetchFromGitHub
+, gdk_pixbuf, glib, gtk3, pango, webkitgtk
+, pygobject3, pyyaml
+}:
 
-buildPythonPackage rec {
-  name = "rednotebook-1.8.1";
+buildPythonApplication rec {
+  name = "rednotebook-${version}";
+  version = "2.3";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/rednotebook/${name}.tar.gz";
-    sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn";
+  src = fetchFromGitHub {
+    owner = "jendrikseipp";
+    repo = "rednotebook";
+    rev = "v${version}";
+    sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj";
   };
 
-  # no tests available
+  # We have not packaged tests.
   doCheck = false;
 
-  propagatedBuildInputs = [ pygtk pywebkitgtk pyyaml chardet ];
+  propagatedBuildInputs = [
+    gdk_pixbuf glib gtk3 pango webkitgtk
+    pygobject3 pyyaml
+  ];
+
+  makeWrapperArgs = [
+    "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
+    "--prefix XDG_DATA_DIRS : $out/share"
+    "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  ];
 
   meta = with lib; {
-    homepage = http://rednotebook.sourceforge.net/index.html;
+    homepage = http://rednotebook.sourceforge.net/;
     description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ tstrobel ];
+    maintainers = with maintainers; [ orivej tstrobel ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82ca5a10ffc..a632eb3ece1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16361,6 +16361,8 @@ with pkgs;
 
   recode = callPackage ../tools/text/recode { };
 
+  rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { };
+
   remotebox = callPackage ../applications/virtualization/remotebox { };
 
   retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da7fae5f904..36f9ff86629 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22735,7 +22735,7 @@ EOF
     };
   };
 
-  redNotebook = callPackage ../applications/editors/rednotebook { };
+  redNotebook = pkgs.rednotebook; # Backwards compatibility alias.
 
   uncertainties = callPackage ../development/python-modules/uncertainties { };