From 775a430907b03a182f0665f2b3f642875bae19bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Aug 2023 18:11:55 -0700 Subject: [PATCH] hyperpotamus: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 232 ------------------ pkgs/tools/misc/hyperpotamus/default.nix | 28 +++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 31 insertions(+), 233 deletions(-) create mode 100644 pkgs/tools/misc/hyperpotamus/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 55ebe329d88f..a4c7fcc0bac4 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -60,6 +60,7 @@ mapAliases { gtop = pkgs.gtop; # added 2023-07-31 inherit (pkgs) htmlhint; # added 2023-08-19 hueadm = pkgs.hueadm; # added 2023-07-31 + inherit (pkgs) hyperpotamus; # added 2023-08-19 immich = pkgs.immich-cli; # added 2023-08-19 indium = throw "indium was removed because it was broken"; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2d891a114df5..0aebdf8d244d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -161,7 +161,6 @@ , "hsd" , "hs-airdrop" , "hs-client" -, "hyperpotamus" , "ijavascript" , "inliner" , "imapnotify" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c68dddcf5b27..815d73ee946a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -107999,238 +107999,6 @@ in bypassCache = true; reconstructLock = true; }; - hyperpotamus = nodeEnv.buildNodePackage { - name = "hyperpotamus"; - packageName = "hyperpotamus"; - version = "0.39.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hyperpotamus/-/hyperpotamus-0.39.0.tgz"; - sha512 = "T3RBIVw6hZACXRtlE3F0scXQa2tU3Ybbg2d0MDBYulv3NunZ5U0LHtBFnslWwFShNlnrXCEo5+f0TXj4YP4y6Q=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - sources."@fast-csv/format-4.3.5" - sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.54" - sources."ajv-6.12.6" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-1.0.10" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.4" - sources."asynckit-0.4.0" - sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1433.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.2" - sources."boolbase-1.0.0" - sources."buffer-4.9.2" - sources."calfinated-1.4.1" - sources."call-bind-1.0.2" - sources."caseless-0.12.0" - sources."cheerio-0.22.0" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."core-util-is-1.0.2" - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" - sources."ecc-jsbn-0.1.2" - sources."emoji-regex-8.0.0" - sources."entities-1.1.2" - sources."escalade-3.1.1" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."events-1.1.1" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."eyes-0.1.8" - sources."fast-csv-4.3.6" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."for-each-0.3.3" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."function-bind-1.1.1" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."getpass-0.1.7" - sources."gopd-1.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."htmlparser2-3.10.1" - sources."http-signature-1.2.0" - sources."ieee754-1.1.13" - sources."inherits-2.0.4" - (sources."ip-address-6.1.0" // { - dependencies = [ - sources."jsbn-1.1.0" - sources."sprintf-js-1.1.2" - ]; - }) - sources."is-arguments-1.1.1" - sources."is-callable-1.2.7" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-typed-array-1.1.12" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."jmespath-0.16.0" - sources."js-yaml-3.14.1" - 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."jsonpath-1.1.1" // { - dependencies = [ - sources."esprima-1.2.2" - ]; - }) - (sources."jsprim-1.4.2" // { - dependencies = [ - sources."verror-1.10.0" - ]; - }) - sources."levn-0.3.0" - sources."lodash-4.17.21" - sources."lodash.assignin-4.2.0" - sources."lodash.bind-4.2.1" - sources."lodash.defaults-4.2.0" - sources."lodash.escaperegexp-4.1.2" - sources."lodash.filter-4.6.0" - sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.groupby-4.6.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isequal-4.5.0" - sources."lodash.isfunction-3.0.9" - sources."lodash.isnil-4.0.0" - sources."lodash.isundefined-3.0.1" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.2" - sources."lodash.pick-4.4.0" - sources."lodash.reduce-4.6.0" - sources."lodash.reject-4.6.0" - sources."lodash.some-4.6.0" - sources."lodash.uniq-4.5.0" - sources."marked-4.3.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."moment-2.29.4" - sources."moment-timezone-0.5.43" - sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."named-regexp-0.1.1" - sources."nth-check-1.0.2" - sources."oauth-sign-0.9.0" - sources."optionator-0.8.3" - sources."performance-now-2.1.0" - sources."prelude-ls-1.1.2" - (sources."prompt-1.3.0" // { - dependencies = [ - sources."async-3.2.3" - ]; - }) - sources."psl-1.9.0" - sources."punycode-1.3.2" - sources."qs-6.5.3" - sources."querystring-0.2.0" - sources."read-1.0.7" - sources."readable-stream-3.6.2" - sources."recursive-readdir-sync-1.0.6" - (sources."request-2.88.2" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."request-as-curl-0.1.0" - sources."require-directory-2.1.1" - sources."revalidator-0.1.8" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.1" - sources."semver-5.7.2" - sources."socks5-client-1.2.8" - sources."socks5-http-client-1.0.4" - sources."source-map-0.6.1" - sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" - sources."stack-trace-0.0.10" - sources."static-eval-2.0.2" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - (sources."tough-cookie-2.5.0" // { - dependencies = [ - sources."punycode-2.3.0" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."underscore-1.12.1" - (sources."uri-js-4.4.1" // { - dependencies = [ - sources."punycode-2.3.0" - ]; - }) - sources."url-0.10.3" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."uuid-8.0.0" - sources."verror-1.10.1" - sources."which-typed-array-1.1.11" - (sources."winston-2.4.7" // { - dependencies = [ - sources."colors-1.0.3" - ]; - }) - sources."word-wrap-1.2.5" - sources."wrap-ansi-7.0.0" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."xmldom-0.5.0" - sources."xpath-0.0.23" - sources."y18n-5.0.8" - sources."yaml-include-1.2.1" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "YAML based HTTP script processing engine"; - homepage = "https://github.com/pmarkert/hyperpotamus/wiki"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; ijavascript = nodeEnv.buildNodePackage { name = "ijavascript"; packageName = "ijavascript"; diff --git a/pkgs/tools/misc/hyperpotamus/default.nix b/pkgs/tools/misc/hyperpotamus/default.nix new file mode 100644 index 000000000000..869b8aea9143 --- /dev/null +++ b/pkgs/tools/misc/hyperpotamus/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "hyperpotamus"; + version = "0.39.0"; + + src = fetchFromGitHub { + owner = "pmarkert"; + repo = "hyperpotamus"; + rev = "v${version}"; + hash = "sha256-dExkvObz+PNjqAZnigZHs/DCSHq31jDg9pgFmmtPmWk="; + }; + + npmDepsHash = "sha256-cH0VEhs4q13gnFKQmmu8fXjueBu/u7xtySE6HTm+bik="; + + dontNpmBuild = true; + + meta = { + description = "YAML based HTTP script processing engine"; + homepage = "https://github.com/pmarkert/hyperpotamus"; + license = lib.licenses.mit; + mainProgram = "hyperpotamus"; + maintainers = with lib.maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b1857254af0..34b812970410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1804,6 +1804,8 @@ with pkgs; httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; + hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; + immich-cli = callPackage ../tools/misc/immich-cli { }; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;