From 99984987a8c570a0beb26400efe3c7ed2628edc0 Mon Sep 17 00:00:00 2001
From: Anatolii Prylutskyi <anpryl@gmail.com>
Date: Sun, 27 Mar 2022 13:23:04 +0300
Subject: [PATCH 1/2] dragon-drop: remove duplicate package

Removing package because it is duplicate package of "xdragon".
---
 pkgs/tools/X11/dragon-drop/default.nix | 28 --------------------------
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/tools/X11/dragon-drop/default.nix

diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix
deleted file mode 100644
index adf43ae8c08d..000000000000
--- a/pkgs/tools/X11/dragon-drop/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, gtk, pkg-config, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "dragon-drop";
-  version = "1.1.1";
-
-  src = fetchFromGitHub {
-    owner = "mwh";
-    repo = "dragon";
-    rev = "v${version}";
-    sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk ];
-
-  installPhase = ''
-    install -D dragon -t $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Simple drag-and-drop source/sink for X";
-    homepage = "https://github.com/mwh/dragon";
-    maintainers = with maintainers; [ jb55 markus1189 ];
-    license = licenses.gpl3;
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69e0f05c77ba..b29994d3a579 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2982,9 +2982,7 @@ with pkgs;
 
   dpic = callPackage ../tools/graphics/dpic { };
 
-  dragon-drop = callPackage ../tools/X11/dragon-drop {
-    gtk = gtk3;
-  };
+  dragon-drop = throw "'dragon-drop' has been renamed to/replaced by 'xdragon'"; # Converted to throw 2022-03-27;
 
   dstp = callPackage ../development/tools/dstp { };
 

From 4ba10af21f3581ac7c8eb59ca2e14e88711fc6f9 Mon Sep 17 00:00:00 2001
From: Anatolii Prylutskyi <anpryl@gmail.com>
Date: Sun, 27 Mar 2022 13:24:27 +0300
Subject: [PATCH 2/2] xdragon: refactor

After removing duplicate package "dragon-drop" moving xdragon
to X11 folder.
---
 pkgs/{applications/misc => tools/X11}/xdragon/default.nix | 0
 pkgs/top-level/aliases.nix                                | 1 +
 pkgs/top-level/all-packages.nix                           | 4 +---
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{applications/misc => tools/X11}/xdragon/default.nix (100%)

diff --git a/pkgs/applications/misc/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix
similarity index 100%
rename from pkgs/applications/misc/xdragon/default.nix
rename to pkgs/tools/X11/xdragon/default.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 174d2c721993..02441bc859be 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -273,6 +273,7 @@ mapAliases ({
   dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
   dotnet-netcore = dotnet-runtime; # Added 2021-10-07
   double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
+  dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;
   draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
   dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03
   dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b29994d3a579..24e7795c28f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2982,8 +2982,6 @@ with pkgs;
 
   dpic = callPackage ../tools/graphics/dpic { };
 
-  dragon-drop = throw "'dragon-drop' has been renamed to/replaced by 'xdragon'"; # Converted to throw 2022-03-27;
-
   dstp = callPackage ../development/tools/dstp { };
 
   dsvpn = callPackage ../applications/networking/dsvpn { };
@@ -34066,7 +34064,7 @@ with pkgs;
 
   sift = callPackage ../tools/text/sift { };
 
-  xdragon = lowPrio (callPackage ../applications/misc/xdragon { });
+  xdragon = lowPrio (callPackage ../tools/X11/xdragon { });
 
   xlockmore = callPackage ../misc/screensavers/xlockmore { };