From 9381ddc2fe51ac6b452abed2219ad57cb01c0a37 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sat, 15 Nov 2025 05:14:42 +0000
Subject: [PATCH 1/4] icemon: migrate to pkgs/by-name

---
 .../default.nix => by-name/ic/icemon/package.nix}     | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename pkgs/{applications/networking/icemon/default.nix => by-name/ic/icemon/package.nix} (87%)

diff --git a/pkgs/applications/networking/icemon/default.nix b/pkgs/by-name/ic/icemon/package.nix
similarity index 87%
rename from pkgs/applications/networking/icemon/default.nix
rename to pkgs/by-name/ic/icemon/package.nix
index 7b7405f99d2f..89519241d280 100644
--- a/pkgs/applications/networking/icemon/default.nix
+++ b/pkgs/by-name/ic/icemon/package.nix
@@ -1,19 +1,18 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
-  mkDerivation,
-  qtbase,
   cmake,
   extra-cmake-modules,
   icecream,
   libcap_ng,
+  libsForQt5,
   lzo,
   zstd,
   libarchive,
-  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "icemon";
   version = "3.3";
 
@@ -27,11 +26,11 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     icecream
-    qtbase
+    libsForQt5.qtbase
     libcap_ng
     lzo
     zstd
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a4b3203986a..dbd0c739bc0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2980,8 +2980,6 @@ with pkgs;
 
   hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix { });
 
-  icemon = libsForQt5.callPackage ../applications/networking/icemon { };
-
   icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;
 
   ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {

From 7c460ea75b727efb3e87df454f5dfa7c88eaefaa Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sat, 15 Nov 2025 05:41:03 +0000
Subject: [PATCH 2/4] icemon: 3.3 -> 3.3-unstable-2025-05-15

- Diff:
https://github.com/icecc/icemon/compare/v3.3...d0969453c7d4467e22dcff0f218b31e81136afbe

- Fixes build with CMake 4.

- Migrates from Qt5 to Qt6.

- Latest upstream commit is not tracked as the application seg faults.
---
 pkgs/by-name/ic/icemon/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ic/icemon/package.nix b/pkgs/by-name/ic/icemon/package.nix
index 89519241d280..863ffd5125c1 100644
--- a/pkgs/by-name/ic/icemon/package.nix
+++ b/pkgs/by-name/ic/icemon/package.nix
@@ -6,31 +6,31 @@
   extra-cmake-modules,
   icecream,
   libcap_ng,
-  libsForQt5,
   lzo,
+  qt6,
   zstd,
   libarchive,
 }:
 
 stdenv.mkDerivation rec {
   pname = "icemon";
-  version = "3.3";
+  version = "3.3-unstable-2025-05-15";
 
   src = fetchFromGitHub {
     owner = "icecc";
     repo = "icemon";
-    rev = "v${version}";
-    sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc";
+    rev = "d0969453c7d4467e22dcff0f218b31e81136afbe";
+    hash = "sha256-jN374J8PytnZgVEUSZ6DakmPmi411ABJffzuZ5CodJ8=";
   };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
     icecream
-    libsForQt5.qtbase
+    qt6.qtbase
     libcap_ng
     lzo
     zstd

From f39bb9b360260caafc94035e9bcc36edaef1db5d Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sat, 15 Nov 2025 05:46:50 +0000
Subject: [PATCH 3/4] icemon: modernise

---
 pkgs/by-name/ic/icemon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ic/icemon/package.nix b/pkgs/by-name/ic/icemon/package.nix
index 863ffd5125c1..5ee2efba8036 100644
--- a/pkgs/by-name/ic/icemon/package.nix
+++ b/pkgs/by-name/ic/icemon/package.nix
@@ -12,7 +12,7 @@
   libarchive,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "icemon";
   version = "3.3-unstable-2025-05-15";
 
@@ -39,10 +39,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Icecream GUI Monitor";
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/icecc/icemon";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ emantor ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "icemon";
   };
-}
+})

From 00e7e2594d5660069e98f5d84e4efd3599094900 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sat, 15 Nov 2025 05:50:08 +0000
Subject: [PATCH 4/4] icemon: enable building of man pages

---
 pkgs/by-name/ic/icemon/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ic/icemon/package.nix b/pkgs/by-name/ic/icemon/package.nix
index 5ee2efba8036..41d872b6c3a0 100644
--- a/pkgs/by-name/ic/icemon/package.nix
+++ b/pkgs/by-name/ic/icemon/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  asciidoc,
   fetchFromGitHub,
   cmake,
   extra-cmake-modules,
@@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
+    asciidoc
     cmake
     extra-cmake-modules
     qt6.wrapQtAppsHook