Merge pull request #250203 from dotlambda/configurable-http-proxy-buildNpmPackage

configurable-http-proxy: use buildNpmPackage

pkgs/development/node-packages/aliases.nix

···
   inherit (pkgs) carto; # added 2023-08-17
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) clean-css-cli; # added 2023-08-18
+  inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
   eslint_d = pkgs.eslint_d; # Added 2023-05-26

pkgs/development/node-packages/node-packages.json

···
 , "coffee-script"
 , "coinmon"
 , "concurrently"
-, "configurable-http-proxy"
 , "conventional-changelog-cli"
 , "cordova"
 , "cpy-cli"

pkgs/development/node-packages/node-packages.nix

···
     bypassCache = true;
     reconstructLock = true;
   };
-  configurable-http-proxy = nodeEnv.buildNodePackage {
-    name = "configurable-http-proxy";
-    packageName = "configurable-http-proxy";
-    version = "4.5.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.5.tgz";
-      sha512 = "1GZ1rf+jAqkx/CAO0RZGO8y4kJVZoa72t1/Kank0ZdFAzP9GrCAlg+6qzxxSZ7cKbpyX+KFyif26I+8SN4HCDA==";
-    };
-    dependencies = [
-      sources."@colors/colors-1.5.0"
-      sources."@dabh/diagnostics-2.0.3"
-      sources."@types/triple-beam-1.3.2"
-      sources."async-3.2.4"
-      sources."bintrees-1.0.2"
-      sources."color-3.2.1"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."color-string-1.9.1"
-      sources."colorspace-1.1.4"
-      sources."commander-7.2.0"
-      sources."enabled-2.0.0"
-      sources."eventemitter3-4.0.7"
-      sources."fecha-4.2.3"
-      sources."fn.name-1.1.0"
-      sources."follow-redirects-1.15.2"
-      sources."http-proxy-1.18.1"
-      sources."inherits-2.0.4"
-      sources."is-arrayish-0.3.2"
-      sources."is-stream-2.0.1"
-      sources."kuler-2.0.0"
-      sources."logform-2.5.1"
-      sources."ms-2.1.3"
-      sources."one-time-1.0.0"
-      sources."prom-client-14.2.0"
-      sources."readable-stream-3.6.2"
-      sources."requires-port-1.0.0"
-      sources."safe-buffer-5.2.1"
-      sources."safe-stable-stringify-2.4.3"
-      sources."simple-swizzle-0.2.2"
-      sources."stack-trace-0.0.10"
-      sources."strftime-0.10.2"
-      sources."string_decoder-1.3.0"
-      sources."tdigest-0.1.2"
-      sources."text-hex-1.0.0"
-      sources."triple-beam-1.4.1"
-      sources."util-deprecate-1.0.2"
-      sources."winston-3.8.2"
-      sources."winston-transport-4.5.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A configurable-on-the-fly HTTP Proxy";
-      homepage = "https://github.com/jupyterhub/configurable-http-proxy#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   conventional-changelog-cli = nodeEnv.buildNodePackage {
     name = "conventional-changelog-cli";
     packageName = "conventional-changelog-cli";

pkgs/development/python-modules/jupyterhub/default.nix

···
 , beautifulsoup4
 , buildPythonPackage
 , certipy
+, configurable-http-proxy
 , cryptography
 , entrypoints
 , fetchPypi
···
 
     substituteInPlace jupyterhub/proxy.py --replace \
       "'configurable-http-proxy'" \
-      "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'"
+      "'${configurable-http-proxy}/bin/configurable-http-proxy'"
 
     substituteInPlace jupyterhub/tests/test_proxy.py --replace \
       "'configurable-http-proxy'" \
-      "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'"
+      "'${configurable-http-proxy}/bin/configurable-http-proxy'"
 
     substituteInPlace setup.py --replace \
       "'npm'" "'true'"

pkgs/tools/networking/configurable-http-proxy/default.nix

···
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "configurable-http-proxy";
+  version = "4.5.6";
+
+  src = fetchFromGitHub {
+    owner = "jupyterhub";
+    repo = "configurable-http-proxy";
+    rev = version;
+    hash = "sha256-nj6+GmBw5YSQs23rWVh3qU4jdzRdbPyx43QmZ3LRwn4=";
+  };
+
+  npmDepsHash = "sha256-3HzVI7L1BH9PEBcb7CWWRQqWdSlWiCTo0qqnlSHGn7Y=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    changelog = "https://github.com/jupyterhub/configurable-http-proxy/blob/${src.rev}/CHANGELOG.md";
+    description = "A configurable-on-the-fly HTTP Proxy";
+    homepage = "https://github.com/jupyterhub/configurable-http-proxy";
+    license = lib.licenses.bsd3;
+    mainProgram = "configurable-http-proxy";
+    maintainers = with lib.maintainers; [ ixxie ];
+  };
+}

pkgs/top-level/all-packages.nix

···
 
   colorless = callPackage ../tools/misc/colorless { };
 
+  configurable-http-proxy = callPackage ../tools/networking/configurable-http-proxy { };
+
   cope = callPackage ../tools/misc/cope { };
 
   crypto-tracker = callPackage ../tools/misc/crypto-tracker { };