From eea6943f7fd8f19cd9de1eb0f5853d112953fec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 20 Jan 2024 08:28:25 -0500
Subject: [PATCH] discordchatexporter-cli: move to by-name

---
 .../backup => by-name/di}/discordchatexporter-cli/deps.nix      | 0
 .../di/discordchatexporter-cli/package.nix}                     | 0
 .../backup => by-name/di}/discordchatexporter-cli/updater.sh    | 2 +-
 pkgs/top-level/all-packages.nix                                 | 2 --
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{tools/backup => by-name/di}/discordchatexporter-cli/deps.nix (100%)
 rename pkgs/{tools/backup/discordchatexporter-cli/default.nix => by-name/di/discordchatexporter-cli/package.nix} (100%)
 rename pkgs/{tools/backup => by-name/di}/discordchatexporter-cli/updater.sh (88%)

diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/by-name/di/discordchatexporter-cli/deps.nix
similarity index 100%
rename from pkgs/tools/backup/discordchatexporter-cli/deps.nix
rename to pkgs/by-name/di/discordchatexporter-cli/deps.nix
diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix
similarity index 100%
rename from pkgs/tools/backup/discordchatexporter-cli/default.nix
rename to pkgs/by-name/di/discordchatexporter-cli/package.nix
diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/by-name/di/discordchatexporter-cli/updater.sh
similarity index 88%
rename from pkgs/tools/backup/discordchatexporter-cli/updater.sh
rename to pkgs/by-name/di/discordchatexporter-cli/updater.sh
index cc81761b93d9..d61235ef5c6f 100755
--- a/pkgs/tools/backup/discordchatexporter-cli/updater.sh
+++ b/pkgs/by-name/di/discordchatexporter-cli/updater.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
 new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 if [[ "$new_version" == "$old_version" ]]; then
   echo "Up to date"
   exit 0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ece348a9304..653b08f958e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20885,8 +20885,6 @@ with pkgs;
 
   directfb = callPackage ../development/libraries/directfb { };
 
-  discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { };
-
   discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { };
 
   discord-rpc = callPackage ../development/libraries/discord-rpc {