From d9f6fcbbcf248952f1a06e36057dc347fb159f86 Mon Sep 17 00:00:00 2001 From: Lord-Valen Date: Wed, 30 Aug 2023 19:45:16 -0400 Subject: [PATCH] nodePackages.surge: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 137 ------------------ pkgs/development/tools/surge-cli/default.nix | 25 ++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 28 insertions(+), 138 deletions(-) create mode 100644 pkgs/development/tools/surge-cli/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cfe9e20016384..a9b24f8e44116 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -87,6 +87,7 @@ mapAliases { s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 + surge = pkgs.surge-cli; # Added 2023-09-08 thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ca681cc1024e5..79da3772e732b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -257,7 +257,6 @@ , "sql-formatter" , "stackdriver-statsd-backend" , "stylelint" -, "surge" , "svelte-check" , "svelte-language-server" , "svgo" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3f5c4bcc0b118..4b7b8b19d199f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -111203,143 +111203,6 @@ in bypassCache = true; reconstructLock = true; }; - surge = nodeEnv.buildNodePackage { - name = "surge"; - packageName = "surge"; - version = "0.23.1"; - src = fetchurl { - url = "https://registry.npmjs.org/surge/-/surge-0.23.1.tgz"; - sha512 = "w92meVuKxqO1up0JpSe2iVSiVTv7E7t1qDA9fZhCSZx/+6Q85I3Y2LCoZIcWLpMm9BM0iB843NAWAwdScTR4Uw=="; - }; - dependencies = [ - sources."ajv-6.12.6" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."block-stream-0.0.9" - sources."brace-expansion-1.1.11" - sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."chardet-0.7.0" - sources."cli-cursor-2.1.0" - sources."cli-table3-0.5.1" - sources."cli-width-2.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."escape-string-regexp-1.0.5" - sources."extend-3.0.2" - sources."external-editor-3.1.0" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."figures-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs.realpath-1.0.0" - sources."fstream-1.0.12" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-flag-3.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."inquirer-6.5.2" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."strip-ansi-5.2.0" - ]; - }) - sources."is-domain-0.0.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."lodash-4.17.21" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.3" - (sources."mkdirp-0.5.6" // { - dependencies = [ - sources."minimist-1.2.8" - ]; - }) - sources."moniker-0.1.2" - sources."mute-stream-0.0.7" - sources."netrc-0.1.4" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."os-tmpdir-1.0.2" - sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."progress-1.1.8" - sources."psl-1.9.0" - sources."punycode-2.3.0" - sources."qs-6.5.3" - sources."read-1.0.5" - sources."request-2.88.2" - sources."restore-cursor-2.0.0" - sources."rimraf-2.7.1" - sources."run-async-2.4.1" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.7" - sources."split-0.3.1" - sources."sshpk-1.17.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."supports-color-5.5.0" - sources."surge-fstream-ignore-1.0.6" - sources."surge-ignore-0.2.0" - sources."tarr-1.1.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."tough-cookie-2.5.0" - sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uri-js-4.4.1" - sources."url-parse-as-address-1.0.0" - sources."uuid-3.4.0" - sources."verror-1.10.0" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CDN for front-end developers"; - homepage = "https://github.com/sintaxi/surge#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; diff --git a/pkgs/development/tools/surge-cli/default.nix b/pkgs/development/tools/surge-cli/default.nix new file mode 100644 index 0000000000000..13cd941d1a2ba --- /dev/null +++ b/pkgs/development/tools/surge-cli/default.nix @@ -0,0 +1,25 @@ +{ buildNpmPackage, fetchFromGitHub, lib }: + +buildNpmPackage rec { + pname = "surge-cli"; + version = "0.23.1"; + + src = fetchFromGitHub { + owner = "sintaxi"; + repo = "surge"; + rev = "v${version}"; + hash = "sha256-EpYww/YCQhPFmnOJ1zbigI2qyUrKN2TxKHEju/0Si3M="; + }; + + npmDepsHash = "sha256-F1C/sfOT/Tf+h28g1umP6czLFIsxDkbvT14ZfWLTiCE="; + + dontNpmBuild = true; + + meta = with lib; { + mainProgram = "surge"; + description = "CLI for the surge.sh CDN"; + homepage = "https://surge.sh"; + license = licenses.mit; + maintainers = with maintainers; [ MoritzBoehme ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5575dccdfa43..1ff2be8bdb746 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20279,6 +20279,8 @@ with pkgs; supabase-cli = callPackage ../development/tools/supabase-cli { }; + surge-cli = callPackage ../development/tools/surge-cli { }; + svlint = callPackage ../development/tools/analysis/svlint { }; swarm = callPackage ../development/tools/analysis/swarm { };