From 3fd84991771643bdd80383b6840bf25954e522ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 09:21:39 -0700
Subject: [PATCH] graphqurl: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 410 ------------------
 pkgs/tools/networking/graphqurl/default.nix   |  28 ++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 31 insertions(+), 411 deletions(-)
 create mode 100644 pkgs/tools/networking/graphqurl/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index d7e37e37033d..580f84d71347 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -54,6 +54,7 @@ mapAliases {
   inherit (pkgs.elmPackages) elm-test;
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
   flood = pkgs.flood; # Added 2023-07-25
+  inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
   hueadm = pkgs.hueadm; # added 2023-07-31
   karma = pkgs.karma-runner; # added 2023-07-29
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 7d0e98e19ebb..3eeaf20994f5 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -151,7 +151,6 @@
 , "graphql"
 , "graphql-cli"
 , "graphql-language-service-cli"
-, "graphqurl"
 , "grunt-cli"
 , "makam"
 , "meshcommander"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 301daa1bdaf0..7ddf4e0eed20 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -106487,416 +106487,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  graphqurl = nodeEnv.buildNodePackage {
-    name = "graphqurl";
-    packageName = "graphqurl";
-    version = "1.0.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/graphqurl/-/graphqurl-1.0.1.tgz";
-      sha512 = "97Chda90OBIHCpH6iQHNYc9qTTADN0LOFbiMcRws3V5SottC/0yTDIQDgBzncZYVCkttyjAnT6YmVuNId7ymQA==";
-    };
-    dependencies = [
-      sources."@ardatan/sync-fetch-0.0.1"
-      (sources."@babel/code-frame-7.22.10" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@babel/helper-validator-identifier-7.22.5"
-      (sources."@babel/highlight-7.22.10" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@cronvel/get-pixels-3.4.1"
-      sources."@graphql-tools/batch-execute-8.5.22"
-      sources."@graphql-tools/delegate-9.0.35"
-      sources."@graphql-tools/executor-0.0.20"
-      (sources."@graphql-tools/executor-graphql-ws-0.0.14" // {
-        dependencies = [
-          sources."isomorphic-ws-5.0.0"
-          sources."ws-8.13.0"
-        ];
-      })
-      sources."@graphql-tools/executor-http-0.1.10"
-      (sources."@graphql-tools/executor-legacy-ws-0.0.11" // {
-        dependencies = [
-          sources."isomorphic-ws-5.0.0"
-          sources."ws-8.13.0"
-        ];
-      })
-      sources."@graphql-tools/graphql-file-loader-7.5.17"
-      sources."@graphql-tools/import-6.7.18"
-      sources."@graphql-tools/json-file-loader-7.4.18"
-      sources."@graphql-tools/load-7.8.14"
-      sources."@graphql-tools/merge-8.4.2"
-      sources."@graphql-tools/schema-9.0.19"
-      (sources."@graphql-tools/url-loader-7.17.18" // {
-        dependencies = [
-          sources."isomorphic-ws-5.0.0"
-          sources."ws-8.13.0"
-        ];
-      })
-      sources."@graphql-tools/utils-9.2.1"
-      sources."@graphql-tools/wrap-9.4.2"
-      sources."@graphql-typed-document-node/core-3.2.0"
-      sources."@iarna/toml-2.2.5"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@oclif/command-1.8.0"
-      sources."@oclif/config-1.17.0"
-      sources."@oclif/errors-1.3.4"
-      sources."@oclif/linewrap-1.0.0"
-      (sources."@oclif/parser-3.8.16" // {
-        dependencies = [
-          sources."@oclif/errors-1.3.6"
-        ];
-      })
-      (sources."@oclif/plugin-help-3.2.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.1"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."has-flag-3.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."supports-color-5.5.0"
-          (sources."wrap-ansi-4.0.0" // {
-            dependencies = [
-              sources."string-width-2.1.1"
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
-      sources."@oclif/screen-1.0.4"
-      sources."@peculiar/asn1-schema-2.3.6"
-      sources."@peculiar/json-schema-1.1.12"
-      sources."@peculiar/webcrypto-1.4.3"
-      sources."@repeaterjs/repeater-3.0.4"
-      sources."@types/json-schema-7.0.9"
-      sources."@types/node-20.4.9"
-      sources."@types/ws-8.5.5"
-      sources."@whatwg-node/events-0.0.3"
-      sources."@whatwg-node/fetch-0.8.8"
-      sources."@whatwg-node/node-fetch-0.3.6"
-      sources."accepts-1.3.8"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."ansicolors-0.3.2"
-      sources."argparse-2.0.1"
-      sources."array-flatten-1.1.1"
-      sources."array-union-2.1.0"
-      sources."asn1js-3.0.5"
-      sources."async-limiter-1.0.1"
-      sources."backo2-1.0.2"
-      sources."balanced-match-1.0.2"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
-      sources."bufferutil-4.0.7"
-      sources."busboy-1.6.0"
-      sources."bytes-3.0.0"
-      sources."callsites-3.1.0"
-      sources."cardinal-2.1.1"
-      sources."chalk-4.1.2"
-      sources."chroma-js-2.4.2"
-      sources."clean-stack-3.0.1"
-      (sources."cli-ux-4.9.3" // {
-        dependencies = [
-          sources."ansi-regex-4.1.1"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."clean-stack-2.2.0"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."escape-string-regexp-1.0.5"
-          sources."fs-extra-7.0.1"
-          sources."has-flag-3.0.0"
-          sources."indent-string-3.2.0"
-          sources."is-wsl-1.1.0"
-          sources."semver-5.7.2"
-          sources."strip-ansi-5.2.0"
-          sources."supports-color-5.5.0"
-          sources."tslib-1.14.1"
-        ];
-      })
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      sources."content-disposition-0.5.2"
-      sources."content-type-1.0.5"
-      sources."cookie-0.3.1"
-      sources."cookie-signature-1.0.6"
-      sources."cosmiconfig-8.0.0"
-      sources."cosmiconfig-toml-loader-1.0.0"
-      sources."cross-spawn-7.0.3"
-      sources."cwise-compiler-1.1.3"
-      sources."dataloader-2.2.2"
-      sources."debug-4.3.4"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
-      sources."dir-glob-3.0.1"
-      sources."dset-3.1.2"
-      sources."ee-first-1.1.1"
-      sources."emoji-regex-8.0.0"
-      sources."encodeurl-1.0.2"
-      (sources."encoding-0.1.13" // {
-        dependencies = [
-          sources."iconv-lite-0.6.3"
-        ];
-      })
-      sources."error-ex-1.3.2"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-4.0.0"
-      sources."esprima-4.0.1"
-      sources."etag-1.8.1"
-      sources."eventemitter3-3.1.2"
-      (sources."express-4.16.3" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."extract-files-11.0.0"
-      sources."extract-stack-1.0.0"
-      sources."fast-decode-uri-component-1.0.1"
-      sources."fast-glob-3.3.1"
-      sources."fast-querystring-1.1.2"
-      sources."fast-url-parser-1.1.3"
-      sources."fastq-1.15.0"
-      sources."fill-range-7.0.1"
-      (sources."finalhandler-1.1.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      sources."fs-extra-8.1.0"
-      sources."glob-parent-5.1.2"
-      sources."globby-11.1.0"
-      sources."graceful-fs-4.2.11"
-      sources."graphql-15.4.0"
-      sources."graphql-config-4.5.0"
-      (sources."graphql-language-service-interface-2.10.2" // {
-        dependencies = [
-          sources."graphql-16.7.1"
-          sources."graphql-language-service-utils-2.7.1"
-        ];
-      })
-      (sources."graphql-language-service-parser-1.10.4" // {
-        dependencies = [
-          sources."graphql-16.7.1"
-        ];
-      })
-      (sources."graphql-language-service-types-1.8.7" // {
-        dependencies = [
-          sources."graphql-16.7.1"
-        ];
-      })
-      sources."graphql-language-service-utils-2.5.1"
-      sources."graphql-ws-5.12.1"
-      sources."has-flag-4.0.0"
-      sources."http-errors-1.6.3"
-      sources."hyperlinker-1.0.0"
-      sources."iconv-lite-0.4.19"
-      sources."ignore-5.2.4"
-      (sources."import-fresh-3.3.0" // {
-        dependencies = [
-          sources."resolve-from-4.0.0"
-        ];
-      })
-      sources."indent-string-4.0.0"
-      sources."inherits-2.0.3"
-      sources."iota-array-1.0.0"
-      sources."ipaddr.js-1.9.1"
-      sources."is-arrayish-0.2.1"
-      sources."is-buffer-1.1.6"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."is-wsl-2.2.0"
-      sources."isexe-2.0.0"
-      sources."isomorphic-fetch-3.0.0"
-      sources."isomorphic-ws-4.0.1"
-      sources."iterall-1.3.0"
-      sources."jiti-1.17.1"
-      sources."jpeg-js-0.4.4"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-4.1.0"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."jsonfile-4.0.0"
-      sources."lazyness-1.2.0"
-      sources."lines-and-columns-1.2.4"
-      sources."lodash-4.17.21"
-      sources."lodash._reinterpolate-3.0.0"
-      sources."lodash.template-4.5.0"
-      sources."lodash.templatesettings-4.2.0"
-      sources."lru-cache-6.0.0"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.1"
-      sources."merge2-1.4.1"
-      sources."meros-1.3.0"
-      sources."methods-1.1.2"
-      sources."micromatch-4.0.5"
-      sources."mime-1.4.1"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."minimatch-4.2.3"
-      sources."ms-2.1.2"
-      sources."ndarray-1.0.19"
-      sources."ndarray-pack-1.2.1"
-      sources."negotiator-0.6.3"
-      sources."nextgen-events-1.5.3"
-      sources."node-bitmap-0.0.1"
-      sources."node-fetch-2.6.12"
-      sources."node-gyp-build-4.6.0"
-      sources."normalize-path-2.1.1"
-      sources."nullthrows-1.1.1"
-      sources."omggif-1.0.10"
-      sources."on-finished-2.3.0"
-      sources."open-7.3.1"
-      sources."p-limit-3.1.0"
-      sources."parent-module-1.0.1"
-      sources."parse-json-5.2.0"
-      sources."parseurl-1.3.3"
-      (sources."password-prompt-1.1.3" // {
-        dependencies = [
-          sources."ansi-escapes-4.3.2"
-        ];
-      })
-      sources."path-key-3.1.1"
-      sources."path-to-regexp-0.1.7"
-      sources."path-type-4.0.0"
-      sources."picomatch-2.3.1"
-      sources."pngjs-6.0.0"
-      sources."proxy-addr-2.0.7"
-      sources."punycode-1.4.1"
-      sources."pvtsutils-1.3.3"
-      sources."pvutils-1.1.3"
-      sources."qs-6.5.1"
-      sources."queue-microtask-1.2.3"
-      sources."range-parser-1.2.1"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-          sources."setprototypeof-1.0.3"
-        ];
-      })
-      sources."redeyed-2.1.1"
-      sources."remove-trailing-separator-1.1.0"
-      sources."resolve-from-5.0.0"
-      sources."reusify-1.0.4"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.1.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.5.4"
-      (sources."send-0.16.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."serve-static-1.13.2"
-      sources."setimmediate-1.0.5"
-      sources."setprototypeof-1.1.0"
-      sources."seventh-0.7.40"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."slash-3.0.0"
-      sources."statuses-1.4.0"
-      sources."streamsearch-1.1.0"
-      sources."string-env-interpolation-1.0.1"
-      sources."string-kit-0.11.10"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      (sources."subscriptions-transport-ws-0.9.18" // {
-        dependencies = [
-          sources."ws-5.2.3"
-        ];
-      })
-      sources."supports-color-7.2.0"
-      (sources."supports-hyperlinks-1.0.1" // {
-        dependencies = [
-          sources."has-flag-2.0.0"
-          (sources."supports-color-5.5.0" // {
-            dependencies = [
-              sources."has-flag-3.0.0"
-            ];
-          })
-        ];
-      })
-      sources."symbol-observable-1.2.0"
-      sources."terminal-kit-1.49.4"
-      sources."to-regex-range-5.0.1"
-      sources."tr46-0.0.3"
-      sources."tree-kit-0.7.5"
-      sources."treeify-1.1.0"
-      sources."tslib-2.6.1"
-      sources."type-fest-0.21.3"
-      sources."type-is-1.6.18"
-      sources."uniq-1.0.1"
-      sources."universalify-0.1.2"
-      sources."unixify-1.0.0"
-      sources."unpipe-1.0.0"
-      sources."urlpattern-polyfill-8.0.2"
-      sources."utf-8-validate-6.0.3"
-      sources."utils-merge-1.0.1"
-      sources."value-or-promise-1.0.12"
-      sources."vary-1.1.2"
-      sources."vscode-languageserver-types-3.17.3"
-      sources."web-streams-polyfill-3.2.1"
-      sources."webcrypto-core-1.7.7"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-fetch-3.6.17"
-      sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
-      sources."widest-line-3.1.0"
-      sources."wrap-ansi-7.0.0"
-      (sources."ws-7.4.2" // {
-        dependencies = [
-          sources."utf-8-validate-5.0.10"
-        ];
-      })
-      sources."yallist-4.0.0"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "cURL for GraphQL - CLI and JS library for making GraphQL queries";
-      homepage = "https://github.com/hasura/graphqurl";
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
     packageName = "grunt-cli";
diff --git a/pkgs/tools/networking/graphqurl/default.nix b/pkgs/tools/networking/graphqurl/default.nix
new file mode 100644
index 000000000000..e0b6fa9de9c0
--- /dev/null
+++ b/pkgs/tools/networking/graphqurl/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "graphqurl";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "hasura";
+    repo = "graphqurl";
+    rev = "v${version}";
+    hash = "sha256-0dR8lLD0yatAvE3kA90cNOzVRTFpQmzN1l13hdFr3TM=";
+  };
+
+  npmDepsHash = "sha256-2kLmhNFO/ySa6S9rBNYCePmsYXWz006IxiOJ7ZUkgPw=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "CLI and JS library for making GraphQL queries";
+    homepage = "https://github.com/hasura/graphqurl";
+    license = lib.licenses.asl20;
+    mainProgram = "gq";
+    maintainers = with lib.maintainers; [ bbigras ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a5dde7985f2..f8ab270a886e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17650,6 +17650,8 @@ with pkgs;
 
   graphqlmap = callPackage ../tools/security/graphqlmap { };
 
+  graphqurl = callPackage ../tools/networking/graphqurl { };
+
   groovy = callPackage ../development/interpreters/groovy { };
 
   inherit (callPackages ../applications/networking/cluster/hadoop {