From 5b82aad3f98d8dfee10761d380d3bcda9b07af7a Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Tue, 13 Oct 2020 22:49:14 +0200
Subject: [PATCH 1/2] ultralist: rename from todolist

Announcement: https://github.com/ultralist/ultralist/issues/136.
---
 .../misc/{todolist => ultralist}/default.nix     | 16 ++++++++--------
 pkgs/top-level/aliases.nix                       |  2 ++
 pkgs/top-level/all-packages.nix                  |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)
 rename pkgs/applications/misc/{todolist => ultralist}/default.nix (58%)

diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/ultralist/default.nix
similarity index 58%
rename from pkgs/applications/misc/todolist/default.nix
rename to pkgs/applications/misc/ultralist/default.nix
index e678da0a436..bc209c9afee 100644
--- a/pkgs/applications/misc/todolist/default.nix
+++ b/pkgs/applications/misc/ultralist/default.nix
@@ -1,21 +1,21 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
-  pname = "todolist";
+buildGoModule rec {
+  pname = "ultralist";
   version = "v0.8.1";
 
-  goPackagePath = "github.com/gammons/todolist";
-
   src = fetchFromGitHub {
-    owner = "gammons";
-    repo = "todolist";
+    owner = "ultralist";
+    repo = "ultralist";
     rev = version;
     sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p";
   };
 
+  vendorSha256 = null;
+
   meta = with lib; {
     description = "Simple GTD-style todo list for the command line";
-    homepage = "http://todolist.site";
+    homepage = "https://ultralist.io";
     license = licenses.mit;
     maintainers = with maintainers; [ uvnikita ];
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f95c6e8bc51..001475094bf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -794,6 +794,8 @@ mapAliases ({
 
   gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7.";
 
+  todolist = throw "todolist is now ultralist."; # added 2020-12-27
+
   /* Cleanup before 21.03 */
   riot-desktop = throw "riot-desktop is now element-desktop!";
   riot-web = throw "riot-web is now element-web";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b080f3d3b81..83269f6293e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12456,8 +12456,6 @@ in
 
   todoist-electron = callPackage ../applications/misc/todoist-electron { };
 
-  todolist = callPackage ../applications/misc/todolist { };
-
   travis = callPackage ../development/tools/misc/travis { };
 
   tree-sitter = callPackage ../development/tools/parsing/tree-sitter {
@@ -20575,6 +20573,8 @@ in
 
   ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
 
+  ultralist = callPackage ../applications/misc/ultralist { };
+
   undefined-medium = callPackage ../data/fonts/undefined-medium { };
 
   uni-vga = callPackage ../data/fonts/uni-vga

From 33cc60dc34145f2a890e954cdb64573933b1365f Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Tue, 13 Oct 2020 22:52:51 +0200
Subject: [PATCH 2/2] ultralist: 0.8.1 -> 1.5.1

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

diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix
index bc209c9afee..2943fe29f4a 100644
--- a/pkgs/applications/misc/ultralist/default.nix
+++ b/pkgs/applications/misc/ultralist/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "ultralist";
-  version = "v0.8.1";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "ultralist";
     repo = "ultralist";
     rev = version;
-    sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p";
+    sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp";
   };
 
   vendorSha256 = null;