From c431073b35a602c8bb0635d0d3831949e43a47a7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Aug 2019 02:25:09 -0500
Subject: [PATCH 1/4] heimer: init at 1.11.0

---
 pkgs/applications/misc/heimer/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/misc/heimer/default.nix

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
new file mode 100644
index 00000000000..fd825503a15
--- /dev/null
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -0,0 +1,16 @@
+{ mkDerivation, fetchFromGitHub, cmake, qttools, qtbase }:
+
+mkDerivation rec {
+  pname = "heimer";
+  version = "1.11.0";
+
+  src = fetchFromGitHub {
+    owner = "juzzlin";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    sha256 = "0k1p92viwj2p357rp2ypfljkzxrcvrq3lc76f0872c55zrf253wp";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qttools qtbase ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae495eb019b..a72ae94b18c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19229,6 +19229,8 @@ in
 
   hashit = callPackage ../tools/misc/hashit { };
 
+  heimer = libsForQt5.callPackage ../applications/misc/heimer { };
+
   hello = callPackage ../applications/misc/hello { };
   hello-unfree = callPackage ../applications/misc/hello-unfree { };
 

From 6e7d5a7513fe2c4188dbd2c383a831c8c047958a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 1 Dec 2019 21:07:10 -0600
Subject: [PATCH 2/4] heimer: 1.11.0 -> 1.12.0

---
 pkgs/applications/misc/heimer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index fd825503a15..ff5948633d3 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "heimer";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "0k1p92viwj2p357rp2ypfljkzxrcvrq3lc76f0872c55zrf253wp";
+    sha256 = "1gw4w6cvr3vb4zdb1kq8gwmadh2lb0jd0bd2hc7cw2d5kdbjaln7";
   };
 
   nativeBuildInputs = [ cmake ];

From dd6e5066e8ffae60c4ba6c530c6f85a681e56a81 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 4 Dec 2019 22:26:36 -0600
Subject: [PATCH 3/4] heimer: meta

---
 pkgs/applications/misc/heimer/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index ff5948633d3..1539bb2ed3e 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchFromGitHub, cmake, qttools, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, qttools, qtbase }:
 
 mkDerivation rec {
   pname = "heimer";
@@ -13,4 +13,11 @@ mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ qttools qtbase ];
+
+  meta = with lib; {
+    description = "Simple cross-platform mind map and note-taking tool written in Qt";
+    homepage = "https://github.com/juzzlin/Heimer";
+    license = licenses.gpl3;
+    maintainers  = with maintainers; [ dtzWill ];
+  };
 }

From b5f7f21677a2f7efac104e7c048fd914a7c83685 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 31 Dec 2019 21:34:59 -0600
Subject: [PATCH 4/4] heimer: simplify fetched rev, safe for sane repos.

Suggested by @doronbehar in PR review, thanks!
---
 pkgs/applications/misc/heimer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 1539bb2ed3e..39ae0e04670 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -7,7 +7,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
-    rev = "refs/tags/${version}";
+    rev = version;
     sha256 = "1gw4w6cvr3vb4zdb1kq8gwmadh2lb0jd0bd2hc7cw2d5kdbjaln7";
   };