From 4088fb345e4b2300e3424e58217fbe7b687e4c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Aug 2023 19:07:44 -0700 Subject: [PATCH] node-glob: use buildNpmPackage --- pkgs/data/fonts/openmoji/default.nix | 3 +- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 65 ------------------- pkgs/tools/misc/node-glob/default.nix | 29 +++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 34 insertions(+), 67 deletions(-) create mode 100644 pkgs/tools/misc/node-glob/default.nix diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index c9722f60f204..fd0d8882059c 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -4,6 +4,7 @@ , fetchpatch , scfbuild , fontforge +, node-glob , libuninameslist , nodejs , nodePackages @@ -59,7 +60,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ scfbuild-with-fontforge-20201107 nodejs - nodePackages.glob + node-glob nodePackages.lodash ]; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e3ff0d15396a..7d06f7f1a410 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -65,6 +65,7 @@ mapAliases { inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 inherit (pkgs) htmlhint; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c715380e4f2a..4d5fdce9b846 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -134,7 +134,6 @@ , "git-standup" , "@gitbeaker/cli" , "gitmoji-cli" -, "glob" , "gramma" , "grammarly-languageserver" , "graphql" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 845812fdad5e..d703744c03a7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -88724,71 +88724,6 @@ in bypassCache = true; reconstructLock = true; }; - glob = nodeEnv.buildNodePackage { - name = "glob"; - packageName = "glob"; - version = "10.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; - sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."foreground-child-3.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."lru-cache-10.0.1" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - sources."path-key-3.1.1" - sources."path-scurry-1.10.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "the most correct and second fastest glob implementation in JavaScript"; - homepage = "https://github.com/isaacs/node-glob#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; diff --git a/pkgs/tools/misc/node-glob/default.nix b/pkgs/tools/misc/node-glob/default.nix new file mode 100644 index 000000000000..aba4690bbba4 --- /dev/null +++ b/pkgs/tools/misc/node-glob/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "glob"; + version = "10.3.3"; + + src = fetchFromGitHub { + owner = "isaacs"; + repo = "node-glob"; + rev = "v${version}"; + hash = "sha256-oLlNhQOnu/hlKjNWa5vjqslz1EarZJOpUEXUB+vGQvc="; + }; + + npmDepsHash = "sha256-78oODw+CBCk5JRJbDqLqVmzTVImP7Z7o6jRIimDxZDQ="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/isaacs/node-glob/blob/${src.rev}/changelog.md"; + description = "A little globber for Node.js"; + homepage = "https://github.com/isaacs/node-glob"; + license = lib.licenses.isc; + mainProgram = "glob"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292624c41fd3..77da2d43f867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1890,6 +1890,8 @@ with pkgs; systemd = pkgs.systemd; }; + node-glob = callPackage ../tools/misc/node-glob { }; + nominatim = callPackage ../servers/nominatim { }; ntpd-rs = callPackage ../tools/networking/ntpd-rs { };