Unverified Commit 9363d6ca authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

kcollectd: migrate to by-name (#425546)

parents 6e987485 beeaae4d

pkgs/tools/misc/kcollectd/default.nix→pkgs/by-name/kc/kcollectd/package.nix

+29 −33
Original line number Diff line number Diff line
@@ -2,29 +2,20 @@ 
  lib,

  fetchFromGitLab,

  stdenv,

  wrapQtAppsHook,

  qtbase,

  cmake,

  kconfig,

  kio,

  kiconthemes,

  kxmlgui,

  ki18n,

  kguiaddons,

  extra-cmake-modules,

  boost,

  shared-mime-info,

  rrdtool,

  breeze-icons,

  kdePackages,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "kcollectd";

  version = "0.12.2";

  src = fetchFromGitLab {

    owner = "aerusso";

    repo = pname;

    rev = "v${version}";

    repo = "kcollectd";

    tag = "v${finalAttrs.version}";

    hash = "sha256-35zb5Kx0tRP5l0hILdomCu2YSQfng02mbyyAClm4uZs=";

  };
@@ -32,14 +23,22 @@ stdenv.mkDerivation rec { 
    substituteInPlace kcollectd/rrd_interface.cc --replace-fail 'char *arg[] =' 'const char *arg[] ='

  '';



  nativeBuildInputs = [

    wrapQtAppsHook

  nativeBuildInputs =

    [

      shared-mime-info

      cmake

    ]

    ++ (with kdePackages; [

      wrapQtAppsHook

      extra-cmake-modules

    shared-mime-info

  ];

    ]);



  buildInputs = [

  buildInputs =

    [

      boost

      rrdtool

    ]

    ++ (with kdePackages; [

      qtbase

      kconfig

      kio
@@ -47,11 +46,8 @@ stdenv.mkDerivation rec { 
      kiconthemes

      ki18n

      kguiaddons

    boost

    rrdtool

    # otherwise some buttons are blank

      breeze-icons

  ];

    ]);



  meta = with lib; {

    description = "Graphical frontend to collectd";
@@ -61,4 +57,4 @@ stdenv.mkDerivation rec { 
    platforms = lib.platforms.linux;

    mainProgram = "kcollectd";

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -3568,8 +3568,6 @@ with pkgs; 


  node2nix = nodePackages.node2nix;



  kcollectd = kdePackages.callPackage ../tools/misc/kcollectd { };



  ktailctl = kdePackages.callPackage ../applications/networking/ktailctl { };



  ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump;