Skip to content

Commit

Permalink
Use powercap from nixpkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
elegaanz committed Feb 21, 2024
1 parent d8ced30 commit 4d8ca88
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 33 deletions.
4 changes: 1 addition & 3 deletions nur.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ rec {
'';
});

libpowercap = pkgs.callPackage ./pkgs/libpowercap { };

haskellPackages = import ./pkgs/haskellPackages { inherit pkgs; };

batsched-140 = pkgs.callPackage ./pkgs/batsched/batsched140.nix { inherit loguru redox debug; intervalset = intervalsetlight; };
Expand All @@ -54,7 +52,7 @@ rec {

bacnet-stack = pkgs.callPackage ./pkgs/bacnet-stack { };

colmet = pkgs.callPackage ./pkgs/colmet { inherit libpowercap; };
colmet = pkgs.callPackage ./pkgs/colmet { };

colmet-rs = pkgs.callPackage ./pkgs/colmet-rs { };

Expand Down
7 changes: 3 additions & 4 deletions pkgs/colmet/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, pkgs, fetchFromGitHub, python3Packages, libpowercap }:
{ lib, pkgs, fetchFromGitHub, python3Packages, powercap }:

python3Packages.buildPythonApplication rec {
name = "colmet-${version}";
Expand All @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "1g2m6crdmlgk8c57qa1nss20128dnw9x58yg4r5wdc7zliicahqq";
};

buildInputs = [ libpowercap ];
buildInputs = [ powercap ];

propagatedBuildInputs = with python3Packages; [
pyinotify
Expand All @@ -34,10 +34,9 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Collecting metrics about process running in cpuset and in a distributed environnement";
homepage = https://github.com/oar-team/colmet;
platforms = libpowercap.meta.platforms;
platforms = powercap.meta.platforms;
licence = licenses.gpl2;
longDescription = ''
'';
broken = true; # due to libpowercap
};
}
26 changes: 0 additions & 26 deletions pkgs/libpowercap/default.nix

This file was deleted.

0 comments on commit 4d8ca88

Please sign in to comment.