From 1984e1cab9b3838e4fa96d60a2bf82199e0e0151 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 27 Oct 2024 15:29:50 +0800
Subject: [PATCH 1/3] flent,http-getter: move to by-name

---
 .../flent/default.nix => by-name/fl/flent/package.nix}        | 0
 .../http-getter.nix => by-name/ht/http-getter/package.nix}    | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 4 deletions(-)
 rename pkgs/{applications/networking/flent/default.nix => by-name/fl/flent/package.nix} (100%)
 rename pkgs/{applications/networking/flent/http-getter.nix => by-name/ht/http-getter/package.nix} (100%)

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/by-name/fl/flent/package.nix
similarity index 100%
rename from pkgs/applications/networking/flent/default.nix
rename to pkgs/by-name/fl/flent/package.nix
diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/by-name/ht/http-getter/package.nix
similarity index 100%
rename from pkgs/applications/networking/flent/http-getter.nix
rename to pkgs/by-name/ht/http-getter/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2687074c61e..3b111adb55c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7506,8 +7506,6 @@ with pkgs;
 
   flashrom = callPackage ../tools/misc/flashrom { };
 
-  flent = python3Packages.callPackage ../applications/networking/flent { };
-
   flexoptix-app = callPackage ../tools/misc/flexoptix-app { };
 
   flpsed = callPackage ../applications/editors/flpsed { };
@@ -8471,8 +8469,6 @@ with pkgs;
 
   http-prompt = callPackage ../tools/networking/http-prompt { };
 
-  http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
-
   httpdump = callPackage ../tools/security/httpdump { };
 
   httpie = with python3Packages; toPythonApplication httpie;

From 8a432a45a3da8bc507ee589fb25d9ebddc88ef61 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 27 Oct 2024 15:32:39 +0800
Subject: [PATCH 2/3] flent,http-getter: nixfmt

---
 pkgs/by-name/fl/flent/package.nix       |  6 +++---
 pkgs/by-name/ht/http-getter/package.nix | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix
index f2d796b21384..a94971aa91d0 100644
--- a/pkgs/by-name/fl/flent/package.nix
+++ b/pkgs/by-name/fl/flent/package.nix
@@ -15,8 +15,8 @@ buildPythonApplication rec {
     hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M=";
   };
 
-  buildInputs = [python.pkgs.sphinx];
-  nativeBuildInputs = [qt5.wrapQtAppsHook];
+  buildInputs = [ python.pkgs.sphinx ];
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
   propagatedBuildInputs = [
     procps
     python.pkgs.matplotlib
@@ -50,6 +50,6 @@ buildPythonApplication rec {
     homepage = "https://flent.org";
     license = licenses.gpl3;
 
-    maintainers = [maintainers.mmlb];
+    maintainers = [ maintainers.mmlb ];
   };
 }
diff --git a/pkgs/by-name/ht/http-getter/package.nix b/pkgs/by-name/ht/http-getter/package.nix
index 5ea07cfe4f9d..72fb7f5f52c1 100644
--- a/pkgs/by-name/ht/http-getter/package.nix
+++ b/pkgs/by-name/ht/http-getter/package.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, pkg-config }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  pkg-config,
+}:
 
 stdenv.mkDerivation {
   pname = "http-getter";
@@ -11,7 +18,10 @@ stdenv.mkDerivation {
     sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   buildInputs = [ curl ];
 
   meta = with lib; {

From 254ddffa98fe46d00ef6a98ad0b3c7db24d45ce5 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 27 Oct 2024 15:37:46 +0800
Subject: [PATCH 3/3] flent: 2.1.1 -> 2.2.0

---
 pkgs/by-name/fl/flent/package.nix | 47 +++++++++++++++++++------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix
index a94971aa91d0..5e78f6923f30 100644
--- a/pkgs/by-name/fl/flent/package.nix
+++ b/pkgs/by-name/fl/flent/package.nix
@@ -1,55 +1,66 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
   procps,
-  python,
   qt5,
   xvfb-run,
 }:
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "flent";
-  version = "2.1.1";
+  version = "2.2.0";
+
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M=";
+    hash = "sha256-BPwh3oWIY1YEI+ecgi9AUiX4Ka/Y5dYikwmfvvNB+eg=";
   };
 
-  buildInputs = [ python.pkgs.sphinx ];
+  build-system = [ python3Packages.sphinx ];
+
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];
-  propagatedBuildInputs = [
-    procps
-    python.pkgs.matplotlib
-    python.pkgs.pyqt5
-    python.pkgs.qtpy
+
+  dependencies = with python3Packages; [
+    matplotlib
+    pyqt5
+    qtpy
   ];
+
   nativeCheckInputs = [
-    python.pkgs.mock
+    python3Packages.mock
     xvfb-run
   ];
 
   checkPhase = ''
+    runHook preCheck
+
     # we want the gui tests to always run
     sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
 
+    export XDG_RUNTIME_DIR=$(mktemp -d)
+    export HOME=$(mktemp -d)
     cat >test-runner <<EOF
     #!/bin/sh
-    ${python.pythonOnBuildForHost.interpreter} nix_run_setup test
+    ${python3Packages.python.interpreter} -m unittest discover
     EOF
     chmod +x test-runner
     wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH
     xvfb-run -s '-screen 0 800x600x24' ./test-runner
+
+    runHook postCheck
   '';
 
   preFixup = ''
-    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+    makeWrapperArgs+=(
+      "''${qtWrapperArgs[@]}"
+      --prefix PATH : ${lib.makeBinPath [ procps ]}
+    )
   '';
 
-  meta = with lib; {
+  meta = {
     description = "FLExible Network Tester";
     homepage = "https://flent.org";
-    license = licenses.gpl3;
-
-    maintainers = [ maintainers.mmlb ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ mmlb ];
+    mainProgram = "flent";
   };
 }