From 4150fc1b4b5cf4f07e2a7ff0840436bb5db253a6 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sun, 10 Mar 2024 21:38:04 +0800
Subject: [PATCH 1/2] gtkcord4: migrate to pkgs/by-name

---
 .../gtkcord4/default.nix => by-name/di/dissent/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/audio/gtkcord4/default.nix => by-name/di/dissent/package.nix} (100%)

diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/by-name/di/dissent/package.nix
similarity index 100%
rename from pkgs/applications/audio/gtkcord4/default.nix
rename to pkgs/by-name/di/dissent/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee4d5333683f..47081b224fb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31084,8 +31084,6 @@ with pkgs;
 
   gspeech = callPackage ../applications/audio/gspeech { };
 
-  gtkcord4 = callPackage ../applications/audio/gtkcord4 { };
-
   haruna = libsForQt5.callPackage ../applications/video/haruna { };
 
   hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };

From 6eee9d1c552ab1700e91b1e6c59775e75441b9a3 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sun, 10 Mar 2024 22:00:59 +0800
Subject: [PATCH 2/2] dissent: 0.0.19 -> 0.0.21; renamed from gtkcord4

---
 pkgs/by-name/di/dissent/package.nix | 20 ++++++++++----------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix
index e75e27e7d792..50db40835972 100644
--- a/pkgs/by-name/di/dissent/package.nix
+++ b/pkgs/by-name/di/dissent/package.nix
@@ -17,14 +17,14 @@
 }:
 
 buildGoModule rec {
-  pname = "gtkcord4";
-  version = "0.0.19";
+  pname = "dissent";
+  version = "0.0.21";
 
   src = fetchFromGitHub {
     owner = "diamondburned";
-    repo = pname;
+    repo = "dissent";
     rev = "v${version}";
-    hash = "sha256-TOrAUTYS4J4W1wZvP1TxZf5Nel29YCPoWPN7GYNomkc=";
+    hash = "sha256-stItrULEO4AAl77ykmxmUYZXrHsC8/sBv8tTHqq9/E0=";
   };
 
   nativeBuildInputs = [
@@ -52,17 +52,17 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    install -D -m 444 -t $out/share/applications nix/so.libdb.gtkcord4.desktop
-    install -D -m 444 internal/icons/hicolor/scalable/apps/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg
+    install -D -m 444 -t $out/share/applications nix/so.libdb.dissent.desktop
+    install -D -m 444 internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg $out/share/icons/hicolor/scalable/apps/so.libdb.dissent.svg
   '';
 
-  vendorHash = "sha256-dJm+v7/2+TQWoU7G1uOpie6KN5W0JqfLU4mF8mghV4A=";
+  vendorHash = "sha256-mwY1M81EWfbF/gYXQl5bcEXxN9N1npD+GgUSMc7gy90=";
 
   meta = with lib; {
-    description = "GTK4 Discord client in Go, attempt #4";
-    homepage = "https://github.com/diamondburned/gtkcord4";
+    description = "GTK4 Discord client in Go, attempt #4 (formerly gtkcord4)";
+    homepage = "https://github.com/diamondburned/dissent";
     license = licenses.gpl3Only;
-    mainProgram = "gtkcord4";
+    mainProgram = "dissent";
     maintainers = with maintainers; [ hmenke urandom aleksana ];
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eef412e566c2..77a71a174b07 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -446,6 +446,7 @@ mapAliases ({
   gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10
   grub2_full = grub2; # Added 2022-11-18
   grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11
+  gtkcord4 = dissent; # Added 2024-03-10
   guile-disarchive = disarchive; # Added 2023-10-27
   guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16