diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 059730684c3..05d996865fb 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -53,4 +53,5 @@ mapAliases { triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 + zx = pkgs.zx; # added 2023-08-01 } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9c9a80b8f55..da2f95ab848 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -395,5 +395,4 @@ , "yarn" , "yo" , "@zwave-js/server" -, "zx" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b853a502a6f..a05307fcc56 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -151836,79 +151836,4 @@ in bypassCache = true; reconstructLock = true; }; - zx = nodeEnv.buildNodePackage { - name = "zx"; - packageName = "zx"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-7.2.3.tgz"; - sha512 = "QODu38nLlYXg/B/Gw7ZKiZrvPkEsjPN3LQ5JFXM7h0JvwhEdPNNl+4Ao1y4+o3CLNiDUNcwzQYZ4/Ko7kKzCMA=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/fs-extra-11.0.1" - sources."@types/jsonfile-6.1.1" - sources."@types/minimist-1.2.2" - sources."@types/node-18.16.19" - sources."@types/ps-tree-1.1.2" - sources."@types/which-3.0.0" - sources."braces-3.0.2" - sources."chalk-5.3.0" - sources."data-uri-to-buffer-4.0.1" - sources."dir-glob-3.0.1" - sources."duplexer-0.1.2" - sources."event-stream-3.3.4" - sources."fast-glob-3.3.0" - sources."fastq-1.15.0" - sources."fetch-blob-3.2.0" - sources."fill-range-7.0.1" - sources."formdata-polyfill-4.0.10" - sources."from-0.1.7" - sources."fs-extra-11.1.1" - sources."fx-28.0.0" - sources."glob-parent-5.1.2" - sources."globby-13.2.2" - sources."graceful-fs-4.2.11" - sources."ignore-5.2.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jsonfile-6.1.0" - sources."map-stream-0.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."minimist-1.2.8" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.1" - sources."path-type-4.0.0" - sources."pause-stream-0.0.11" - sources."picomatch-2.3.1" - sources."ps-tree-1.2.0" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."slash-4.0.0" - sources."split-0.3.3" - sources."stream-combiner-0.0.4" - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."universalify-2.0.0" - sources."web-streams-polyfill-3.2.1" - sources."webpod-0.0.2" - sources."which-3.0.1" - sources."yaml-2.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for writing better scripts"; - homepage = "https://github.com/google/zx#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix new file mode 100644 index 00000000000..857661c31f2 --- /dev/null +++ b/pkgs/tools/system/zx/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "zx"; + version = "7.2.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = "zx"; + rev = version; + hash = "sha256-YMfecNazmL8J+f80FdIRvr2upQ7VgXSkQQnm8z0Swhw="; + }; + + npmDepsHash = "sha256-ywNd2LGjM35ecW4dnj0oNwdSX2CRy8i9OGKPIdI0UEQ="; + + meta = { + description = "Tool for writing scripts using JavaScript"; + homepage = "https://github.com/google/zx"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hlolli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7d3617124f..bb6c180401e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36527,7 +36527,7 @@ with pkgs; zsteg = callPackage ../tools/security/zsteg { }; - inherit (nodePackages) zx; + zx = callPackage ../tools/system/zx { }; zxfer = callPackage ../applications/system/zxfer { };