From a85e9001f321f483be41ff55639582c4cb32a683 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:17:41 +0200
Subject: [PATCH] pgadmin4: move to by-name

---
 .../pg/pgadmin4}/check-system-config-dir.patch                | 0
 .../pgadmin => by-name/pg/pgadmin4}/expose-setup.py.patch     | 0
 .../admin/pgadmin => by-name/pg/pgadmin4}/missing-hashes.json | 0
 .../pgadmin/default.nix => by-name/pg/pgadmin4/package.nix}   | 0
 pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/update.sh   | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 +---
 6 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/check-system-config-dir.patch (100%)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/expose-setup.py.patch (100%)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/missing-hashes.json (100%)
 rename pkgs/{tools/admin/pgadmin/default.nix => by-name/pg/pgadmin4/package.nix} (100%)
 rename pkgs/{tools/admin/pgadmin => by-name/pg/pgadmin4}/update.sh (94%)

diff --git a/pkgs/tools/admin/pgadmin/check-system-config-dir.patch b/pkgs/by-name/pg/pgadmin4/check-system-config-dir.patch
similarity index 100%
rename from pkgs/tools/admin/pgadmin/check-system-config-dir.patch
rename to pkgs/by-name/pg/pgadmin4/check-system-config-dir.patch
diff --git a/pkgs/tools/admin/pgadmin/expose-setup.py.patch b/pkgs/by-name/pg/pgadmin4/expose-setup.py.patch
similarity index 100%
rename from pkgs/tools/admin/pgadmin/expose-setup.py.patch
rename to pkgs/by-name/pg/pgadmin4/expose-setup.py.patch
diff --git a/pkgs/tools/admin/pgadmin/missing-hashes.json b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
similarity index 100%
rename from pkgs/tools/admin/pgadmin/missing-hashes.json
rename to pkgs/by-name/pg/pgadmin4/missing-hashes.json
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/by-name/pg/pgadmin4/package.nix
similarity index 100%
rename from pkgs/tools/admin/pgadmin/default.nix
rename to pkgs/by-name/pg/pgadmin4/package.nix
diff --git a/pkgs/tools/admin/pgadmin/update.sh b/pkgs/by-name/pg/pgadmin4/update.sh
similarity index 94%
rename from pkgs/tools/admin/pgadmin/update.sh
rename to pkgs/by-name/pg/pgadmin4/update.sh
index 734853b4af1a..de6bfcf81988 100755
--- a/pkgs/tools/admin/pgadmin/update.sh
+++ b/pkgs/by-name/pg/pgadmin4/update.sh
@@ -52,12 +52,12 @@ fi
 printf "Done\n"
 
 if [[ -f missing-hashes.json ]]; then
-  if [[ ! -f "$nixpkgs/pkgs/tools/admin/pgadmin/missing-hashes.json" ]]; then
+  if [[ ! -f "$nixpkgs/pkgs/by-name/pg/pgadmin4/missing-hashes.json" ]]; then
     printf "PLEASE NOTE: FIRST TIME OF FINDING MISSING HASHES!"
     printf "Please add \"missingHashes = ./missing-hashes.json\" to pgadmin derivation"
   fi
   printf "Copy files to nixpkgs\n"
-  cp missing-hashes.json "$nixpkgs/pkgs/tools/admin/pgadmin/"
+  cp missing-hashes.json "$nixpkgs/pkgs/by-name/pg/pgadmin4"
 fi
 
 printf "Done\n"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24f9513fb205..1fe0bbffe8dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15666,9 +15666,7 @@ with pkgs;
 
   resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };
 
-  pgadmin4 = callPackage ../tools/admin/pgadmin { };
-
-  pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; };
+  pgadmin4-desktopmode = pgadmin4.override { server-mode = false; };
 
   philipstv = with python3Packages; toPythonApplication philipstv;