diff --git a/pkgs/applications/networking/icemon/default.nix b/pkgs/by-name/ic/icemon/package.nix similarity index 64% rename from pkgs/applications/networking/icemon/default.nix rename to pkgs/by-name/ic/icemon/package.nix index 7b7405f99d2f..41d872b6c3a0 100644 --- a/pkgs/applications/networking/icemon/default.nix +++ b/pkgs/by-name/ic/icemon/package.nix @@ -1,37 +1,38 @@ { lib, + stdenv, + asciidoc, fetchFromGitHub, - mkDerivation, - qtbase, cmake, extra-cmake-modules, icecream, libcap_ng, lzo, + qt6, zstd, libarchive, - wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { 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 = [ + asciidoc cmake extra-cmake-modules - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ icecream - qtbase + qt6.qtbase libcap_ng lzo zstd @@ -40,10 +41,10 @@ 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"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb6250777a91..6d24e7993433 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2896,8 +2896,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 {