From 2385e73cca73dbf0f853080e959834526aef7a8a Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 25 Jul 2023 21:11:30 +0100
Subject: flood: repackage using buildNpmPackage

Related issue: #229475

Co-authored-by: Winter <winter@winter.cafe>
---
 pkgs/applications/networking/p2p/flood/default.nix | 27 ++++++++++++++++++++++
 pkgs/development/node-packages/aliases.nix         |  1 +
 pkgs/development/node-packages/node-packages.json  |  1 -
 pkgs/development/node-packages/node-packages.nix   | 18 ---------------
 pkgs/development/node-packages/overrides.nix       |  4 ----
 pkgs/top-level/all-packages.nix                    |  2 +-
 6 files changed, 29 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/applications/networking/p2p/flood/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix
new file mode 100644
index 0000000000000..f4b8a7636014f
--- /dev/null
+++ b/pkgs/applications/networking/p2p/flood/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "flood";
+  version = "4.7.0";
+
+  src = fetchFromGitHub {
+    owner = "jesec";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM=";
+  };
+
+  npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw=";
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  meta = with lib; {
+    description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
+    homepage = "https://flood.js.org";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ thiagokokada winter ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 05d996865fbff..7222a6f7d4cc6 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -46,6 +46,7 @@ mapAliases {
   bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
   bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
+  flood = pkgs.flood; # Added 2023-07-25
   gtop = pkgs.gtop; # added 2023-07-31
   manta = pkgs.node-manta; # Added 2023-05-06
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index da2f95ab848ce..5b8d43dab8207 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -140,7 +140,6 @@
 , "fixjson"
 , "fkill-cli"
 , "fleek-cli"
-, "flood"
 , "forever"
 , "fx"
 , "ganache"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 982bc9cb14454..8560786e3c147 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -107221,24 +107221,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  flood = nodeEnv.buildNodePackage {
-    name = "flood";
-    packageName = "flood";
-    version = "4.7.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/flood/-/flood-4.7.0.tgz";
-      sha512 = "MAm4Yok64VPa49DM+0TxBBP0mScW5ILGCsY/HJLbATjHEkJFnwD1mkPndruZxO1vXBaFdPzoLl+gYThAUxWQjA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A modern Web UI for various torrent clients with multi-user and multi-client support";
-      homepage = "https://github.com/jesec/flood#readme";
-      license = "GPL-3.0-only";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   forever = nodeEnv.buildNodePackage {
     name = "forever";
     packageName = "forever";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 863fb6e466748..f462cb90986ca 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -162,10 +162,6 @@ final: prev: {
     nativeBuildInputs = lib.optionals stdenv.isDarwin  [ pkgs.xcbuild ];
   };
 
-  flood = prev.flood.override {
-    buildInputs = [ final.node-pre-gyp ];
-  };
-
   git-ssb = prev.git-ssb.override (oldAttrs: {
     buildInputs = [ final.node-gyp-build ];
     meta = oldAttrs.meta // { broken = since "10"; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9482b47820f60..e4021f1713170 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3652,7 +3652,7 @@ with pkgs;
     readline = readline63;
   };
 
-  flood = nodePackages.flood;
+  flood = callPackage ../applications/networking/p2p/flood { };
 
   font-config-info = callPackage ../tools/misc/font-config-info { };
 
-- 
cgit 1.4.1