Unverified Commit e6c8427e authored by Ryan Mulligan's avatar Ryan Mulligan Committed by GitHub
Browse files

Merge pull request #246385 from dotlambda/gtop-buildNpmPackage 

gtop: use buildNpmPackage
parents cd04ed9c 1027dd69

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ mapAliases { 
  "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06

  bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25

  eslint_d = pkgs.eslint_d; # Added 2023-05-26

  gtop = pkgs.gtop; # added 2023-07-31

  manta = pkgs.node-manta; # Added 2023-05-06

  readability-cli = pkgs.readability-cli; # Added 2023-06-12

  thelounge = pkgs.thelounge; # Added 2023-05-22

pkgs/development/node-packages/node-packages.json

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
, "makam"

, "meshcommander"

, "gqlint"

, "gtop"

, "gulp"

, "gulp-cli"

, "he"

pkgs/development/node-packages/node-packages.nix

+0 −93
Original line number Diff line number Diff line
@@ -112858,99 +112858,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  gtop = nodeEnv.buildNodePackage {

    name = "gtop";

    packageName = "gtop";

    version = "1.1.3";

    src = fetchurl {

      url = "https://registry.npmjs.org/gtop/-/gtop-1.1.3.tgz";

      sha512 = "LkZYdWebxn7qeQApnDN7Q50rwCg4raayL4DIQNPdhIyNKwwm3rbKHeX4+K4cV0SKBen7jVkY4s1c7aIdxGsF8A==";

    };

    dependencies = [

      sources."@colors/colors-1.5.0"

      sources."abbrev-1.1.1"

      sources."ansi-escapes-6.2.0"

      sources."ansi-regex-2.1.1"

      sources."ansi-styles-2.2.1"

      sources."ansi-term-0.0.2"

      sources."ansicolors-0.3.2"

      sources."blessed-0.1.81"

      sources."blessed-contrib-4.11.0"

      sources."bresenham-0.0.3"

      sources."buffers-0.1.1"

      sources."cardinal-2.1.1"

      sources."chalk-1.1.3"

      sources."charm-0.1.2"

      sources."cli-table3-0.6.3"

      sources."core-util-is-1.0.3"

      sources."drawille-blessed-contrib-1.0.0"

      sources."drawille-canvas-blessed-contrib-0.1.3"

      sources."emoji-regex-8.0.0"

      sources."escape-string-regexp-1.0.5"

      sources."esprima-4.0.1"

      (sources."event-stream-0.9.8" // {

        dependencies = [

          sources."optimist-0.2.8"

        ];

      })

      sources."gl-matrix-2.8.1"

      sources."has-ansi-2.0.0"

      sources."has-flag-4.0.0"

      sources."here-0.0.2"

      sources."inherits-2.0.4"

      sources."is-fullwidth-code-point-3.0.0"

      sources."isarray-0.0.1"

      sources."lodash-4.17.21"

      sources."map-canvas-0.1.5"

      sources."marked-4.3.0"

      (sources."marked-terminal-5.2.0" // {

        dependencies = [

          sources."chalk-5.3.0"

        ];

      })

      sources."memory-streams-0.1.3"

      sources."memorystream-0.3.1"

      sources."node-emoji-1.11.0"

      sources."nopt-2.1.2"

      sources."optimist-0.3.7"

      sources."picture-tuber-1.0.2"

      sources."png-js-0.1.1"

      sources."readable-stream-1.0.34"

      sources."redeyed-2.1.1"

      sources."sax-1.2.4"

      sources."sparkline-0.1.2"

      (sources."string-width-4.2.3" // {

        dependencies = [

          sources."ansi-regex-5.0.1"

          sources."strip-ansi-6.0.1"

        ];

      })

      sources."string_decoder-0.10.31"

      sources."strip-ansi-3.0.1"

      sources."supports-color-2.0.0"

      (sources."supports-hyperlinks-2.3.0" // {

        dependencies = [

          sources."supports-color-7.2.0"

        ];

      })

      sources."systeminformation-5.18.7"

      sources."term-canvas-0.0.5"

      sources."type-fest-3.13.1"

      sources."wordwrap-0.0.3"

      sources."x256-0.0.2"

      sources."xml2js-0.4.23"

      sources."xmlbuilder-11.0.1"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "graphic top";

      homepage = "https://github.com/aksakalli/gtop#readme";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  gulp = nodeEnv.buildNodePackage {

    name = "gulp";

    packageName = "gulp";

pkgs/tools/system/gtop/default.nix

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{ lib

, buildNpmPackage

, fetchFromGitHub

}:



buildNpmPackage rec {

  pname = "gtop";

  version = "1.1.3";



  src = fetchFromGitHub {

    owner = "aksakalli";

    repo = "gtop";

    rev = "v${version}";

    hash = "sha256-7jcfJOdy3PKT6+07iaZnjWnlPLk9BhPn8LApk23E8l4=";

  };



  npmDepsHash = "sha256-CUfoVkG74C7HpcO3T9HmwbxHsYAgW1vYBAgNvx2av0k=";



  dontNpmBuild = true;



  meta = {

    description = "System monitoring dashboard for the terminal";

    homepage = "https://github.com/aksakalli/gtop";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ tfc ];

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -27562,7 +27562,7 @@ with pkgs; 














  gt = callPackage ../os-specific/linux/gt { };



























  inherit (nodePackages) gtop;













  gtop = callPackage ../tools/system/gtop { };





























  hd-idle = callPackage ../os-specific/linux/hd-idle { };