From caa398587f5e60dc16c1b0bfb06c7e055c884630 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Mar 2025 00:13:04 +0100
Subject: [PATCH] diffoscope: move to by-name

---
 pkgs/{tools/misc => by-name/di}/diffoscope/ignore_links.patch | 0
 .../misc => by-name/di}/diffoscope/list-missing-tools.sh      | 0
 .../default.nix => by-name/di/diffoscope/package.nix}         | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc => by-name/di}/diffoscope/ignore_links.patch (100%)
 rename pkgs/{tools/misc => by-name/di}/diffoscope/list-missing-tools.sh (100%)
 rename pkgs/{tools/misc/diffoscope/default.nix => by-name/di/diffoscope/package.nix} (99%)

diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/by-name/di/diffoscope/ignore_links.patch
similarity index 100%
rename from pkgs/tools/misc/diffoscope/ignore_links.patch
rename to pkgs/by-name/di/diffoscope/ignore_links.patch
diff --git a/pkgs/tools/misc/diffoscope/list-missing-tools.sh b/pkgs/by-name/di/diffoscope/list-missing-tools.sh
similarity index 100%
rename from pkgs/tools/misc/diffoscope/list-missing-tools.sh
rename to pkgs/by-name/di/diffoscope/list-missing-tools.sh
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/by-name/di/diffoscope/package.nix
similarity index 99%
rename from pkgs/tools/misc/diffoscope/default.nix
rename to pkgs/by-name/di/diffoscope/package.nix
index f78403e05b10..0e8c65a8c5d0 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -41,7 +41,7 @@
   html2text,
   imagemagick,
   installShellFiles,
-  jdk,
+  jdk8,
   libarchive,
   libcaca,
   libxmlb,
@@ -223,7 +223,7 @@ python.pkgs.buildPythonApplication rec {
         gnupg
         hdf5
         imagemagick
-        jdk
+        jdk8
         libcaca
         llvm
         mono
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 178a8aa4de1f..891c19f9a910 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3026,10 +3026,6 @@ with pkgs;
 
   dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { };
 
-  diffoscope = callPackage ../tools/misc/diffoscope {
-    jdk = jdk8;
-  };
-
   diffoscopeMinimal = diffoscope.override {
     enableBloat = false;
   };