icemon: 3.3 -> 3.3-unstable-2025-05-15, fix build, migrate to pkgs/by-name (#461826)
This commit is contained in:
+12
-11
@@ -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";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user