Commit d4260d7a authored by Robert Schütz's avatar Robert Schütz
Browse files

nodePackages.node-pre-gyp: drop

parent 17cc69fd

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ mapAliases { 
  musescore-downloader = pkgs.dl-librescore; # added 2023-08-19

  inherit (pkgs) near-cli; # added 2023-09-09

  node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21

  inherit (pkgs) node-pre-gyp; # added 2024-08-05

  inherit (pkgs) nodemon; # added 2024-06-28

  inherit (pkgs) npm-check-updates; # added 2023-08-22

  ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04

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

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 
, "nijs"

, "node-gyp"

, "node-gyp-build"

, "node-pre-gyp"

, "node-red"

, "node2nix"

, "np"

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

+0 −89
Original line number Diff line number Diff line
@@ -78560,95 +78560,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  node-pre-gyp = nodeEnv.buildNodePackage {

    name = "node-pre-gyp";

    packageName = "node-pre-gyp";

    version = "0.17.0";

    src = fetchurl {

      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz";

      sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A==";

    };

    dependencies = [

      sources."abbrev-1.1.1"

      sources."ansi-regex-2.1.1"

      sources."aproba-1.2.0"

      sources."are-we-there-yet-1.1.7"

      sources."balanced-match-1.0.2"

      sources."brace-expansion-1.1.11"

      sources."chownr-1.1.4"

      sources."code-point-at-1.1.0"

      sources."concat-map-0.0.1"

      sources."console-control-strings-1.1.0"

      sources."core-util-is-1.0.3"

      sources."debug-3.2.7"

      sources."deep-extend-0.6.0"

      sources."delegates-1.0.0"

      sources."detect-libc-1.0.3"

      sources."fs-minipass-1.2.7"

      sources."fs.realpath-1.0.0"

      sources."gauge-2.7.4"

      sources."glob-7.2.3"

      sources."has-unicode-2.0.1"

      sources."iconv-lite-0.4.24"

      sources."ignore-walk-3.0.4"

      sources."inflight-1.0.6"

      sources."inherits-2.0.4"

      sources."ini-1.3.8"

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

      sources."isarray-1.0.0"

      sources."minimatch-3.1.2"

      sources."minimist-1.2.8"

      sources."minipass-2.9.0"

      sources."minizlib-1.3.3"

      sources."mkdirp-0.5.6"

      sources."ms-2.1.3"

      sources."needle-2.9.1"

      sources."nopt-4.0.3"

      sources."npm-bundled-1.1.2"

      sources."npm-normalize-package-bin-1.0.1"

      sources."npm-packlist-1.4.8"

      sources."npmlog-4.1.2"

      sources."number-is-nan-1.0.1"

      sources."object-assign-4.1.1"

      sources."once-1.4.0"

      sources."os-homedir-1.0.2"

      sources."os-tmpdir-1.0.2"

      sources."osenv-0.1.5"

      sources."path-is-absolute-1.0.1"

      sources."process-nextick-args-2.0.1"

      sources."rc-1.2.8"

      sources."readable-stream-2.3.8"

      sources."rimraf-2.7.1"

      sources."safe-buffer-5.1.2"

      sources."safer-buffer-2.1.2"

      sources."sax-1.4.1"

      sources."semver-5.7.2"

      sources."set-blocking-2.0.0"

      sources."signal-exit-3.0.7"

      sources."string-width-1.0.2"

      sources."string_decoder-1.1.1"

      sources."strip-ansi-3.0.1"

      sources."strip-json-comments-2.0.1"

      (sources."tar-4.4.19" // {

        dependencies = [

          sources."safe-buffer-5.2.1"

        ];

      })

      sources."util-deprecate-1.0.2"

      sources."wide-align-1.1.5"

      sources."wrappy-1.0.2"

      sources."yallist-3.1.1"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "Node.js native addon binary install tool";

      homepage = "https://github.com/mapbox/node-pre-gyp#readme";

      license = "BSD-3-Clause";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  node-red = nodeEnv.buildNodePackage {

    name = "node-red";

    packageName = "node-red";

pkgs/development/node-packages/overrides.nix

+8 −8
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ final: prev: { 


      libsecret

      final.node-gyp-build

      final.node-pre-gyp

      node-pre-gyp



      pixman

      cairo
@@ -179,7 +179,7 @@ final: prev: { 
  };



  node-red = prev.node-red.override {

    buildInputs = [ final.node-pre-gyp ];

    buildInputs = [ pkgs.node-pre-gyp ];

  };



  node2nix = prev.node2nix.override {
@@ -349,15 +349,15 @@ final: prev: { 
  });



  thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override {

    nativeBuildInputs = [ final.node-pre-gyp ];

    nativeBuildInputs = [ pkgs.node-pre-gyp ];

  };



  thelounge-plugin-giphy = prev.thelounge-plugin-giphy.override {

    nativeBuildInputs = [ final.node-pre-gyp ];

    nativeBuildInputs = [ pkgs.node-pre-gyp ];

  };



  thelounge-theme-flat-blue = prev.thelounge-theme-flat-blue.override {

    nativeBuildInputs = [ final.node-pre-gyp ];

    nativeBuildInputs = [ pkgs.node-pre-gyp ];

    # TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x)

    preRebuild = ''

      rm -r node_modules/node-gyp
@@ -365,7 +365,7 @@ final: prev: { 
  };



  thelounge-theme-flat-dark = prev.thelounge-theme-flat-dark.override {

    nativeBuildInputs = [ final.node-pre-gyp ];

    nativeBuildInputs = [ pkgs.node-pre-gyp ];

    # TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x)

    preRebuild = ''

      rm -r node_modules/node-gyp
@@ -395,7 +395,7 @@ final: prev: { 
  vega-cli = prev.vega-cli.override {

    nativeBuildInputs = [ pkgs.pkg-config ];

    buildInputs = with pkgs; [

      final.node-pre-gyp

      node-pre-gyp

      pixman

      cairo

      pango
@@ -422,7 +422,7 @@ final: prev: { 
  };



  wavedrom-cli = prev.wavedrom-cli.override {

    nativeBuildInputs = [ pkgs.pkg-config final.node-pre-gyp ];

    nativeBuildInputs = [ pkgs.pkg-config pkgs.node-pre-gyp ];

    # These dependencies are required by

    # https://github.com/Automattic/node-canvas.

    buildInputs = with pkgs; [

pkgs/servers/jellyseerr/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchFromGitHub,

  fetchYarnDeps,

  makeWrapper,

  node-pre-gyp,

  nodejs,

  python3,

  sqlite,
@@ -35,7 +36,7 @@ mkYarnPackage rec { 
  # Fixes "SQLite package has not been found installed" at launch

  pkgConfig.sqlite3 = {

    nativeBuildInputs = [

      nodejs.pkgs.node-pre-gyp

      node-pre-gyp

      python3

      sqlite

    ];
@@ -48,7 +49,7 @@ mkYarnPackage rec { 


  pkgConfig.bcrypt = {

    nativeBuildInputs = [

      nodejs.pkgs.node-pre-gyp

      node-pre-gyp

      python3

    ];

    postInstall = ''