From 5b08f04506efca9d4a016566a891787d278d5e0e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 21 Feb 2026 16:32:50 -0600
Subject: [PATCH] compactor: migrate to by-name, modernize derivation

---
 .../co/compactor/package.nix}                      | 14 ++++++++------
 ...space-after-type-in-check-response-opt-sh.patch |  0
 .../patches/update-golden-cbor2diag-output.patch   |  0
 pkgs/top-level/all-packages.nix                    |  4 ----
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{applications/networking/compactor/default.nix => by-name/co/compactor/package.nix} (90%)
 rename pkgs/{applications/networking => by-name/co}/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch (100%)
 rename pkgs/{applications/networking => by-name/co}/compactor/patches/update-golden-cbor2diag-output.patch (100%)

diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/by-name/co/compactor/package.nix
similarity index 90%
rename from pkgs/applications/networking/compactor/default.nix
rename to pkgs/by-name/co/compactor/package.nix
index b2ab9dd0c9d8..f6335fc6292f 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/by-name/co/compactor/package.nix
@@ -12,7 +12,7 @@
   libpcap,
   libtins,
   openssl,
-  protobuf,
+  protobuf_21,
   xz,
   zlib,
   catch2,
@@ -25,15 +25,17 @@
   tcpdump,
   wireshark-cli,
 }:
-
-stdenv.mkDerivation rec {
+let
+  protobuf = protobuf_21;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "compactor";
   version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "dns-stats";
     repo = "compactor";
-    rev = version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
   };
@@ -100,9 +102,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Tools to capture DNS traffic and record it in C-DNS files";
     homepage = "https://dns-stats.org/";
-    changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";
+    changelog = "https://github.com/dns-stats/compactor/raw/${finalAttrs.version}/ChangeLog.txt";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fdns ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/applications/networking/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch b/pkgs/by-name/co/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch
similarity index 100%
rename from pkgs/applications/networking/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch
rename to pkgs/by-name/co/compactor/patches/add-a-space-after-type-in-check-response-opt-sh.patch
diff --git a/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch b/pkgs/by-name/co/compactor/patches/update-golden-cbor2diag-output.patch
similarity index 100%
rename from pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch
rename to pkgs/by-name/co/compactor/patches/update-golden-cbor2diag-output.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c66fdeff66b9..b0db12aac5da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1618,10 +1618,6 @@ with pkgs;
     extraPackages = [ ffmpeg ];
   };
 
-  compactor = callPackage ../applications/networking/compactor {
-    protobuf = protobuf_21;
-  };
-
   inherit (callPackages ../tools/misc/coreboot-utils { })
     msrtool
     cbmem