configurable-http-proxy: use buildNpmPackage

NixOS · Aug 20, 2023 · 936d4b5 · 936d4b5
1 parent 2e86fde
commit 936d4b5
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 62 deletions.
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
@@ -52,6 +52,7 @@ mapAliases {
   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

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
@@ -99,7 +99,6 @@
 , "coffee-script"
 , "coinmon"
 , "concurrently"
-, "configurable-http-proxy"
 , "conventional-changelog-cli"
 , "cordova"
 , "cpy-cli"

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -5,6 +5,7 @@
 , beautifulsoup4
 , buildPythonPackage
 , certipy
+, configurable-http-proxy
 , cryptography
 , entrypoints
 , fetchPypi
@@ -96,11 +97,11 @@ buildPythonPackage rec {
 
     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'"

diff --git a/pkgs/tools/networking/configurable-http-proxy/default.nix b/pkgs/tools/networking/configurable-http-proxy/default.nix
@@ -0,0 +1,29 @@
+{ 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 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1672,6 +1672,8 @@ with pkgs;
 
   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 { };