From d75c1e561204b53ed383fbc6cccb8062ec5d3133 Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Wed, 13 Sep 2023 22:55:42 +0800
Subject: [PATCH] netproc: unstable-2022-02-11 -> 0.6.6

- Migrate to by-name hierarchy
- Use the finalAttrs pattern for easier overrides
- Add meta.mainProgram
---
 .../ne/netproc/package.nix}                       | 15 ++++++++-------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename pkgs/{tools/networking/netproc/default.nix => by-name/ne/netproc/package.nix} (72%)

diff --git a/pkgs/tools/networking/netproc/default.nix b/pkgs/by-name/ne/netproc/package.nix
similarity index 72%
rename from pkgs/tools/networking/netproc/default.nix
rename to pkgs/by-name/ne/netproc/package.nix
index 851f71fcaab..3f5bd8cbd86 100644
--- a/pkgs/tools/networking/netproc/default.nix
+++ b/pkgs/by-name/ne/netproc/package.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, ncurses }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "netproc";
-  version = "unstable-2022-02-11";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "berghetti";
     repo = "netproc";
-    rev = "87a10ce31ae150847674ad87ef84ef2fd374b420";
-    sha256 = "sha256-YSKDOvqWLCrnP1qjmzMuRgjXiXZ9D4AuxXm/3xzS4gc=";
+    rev = finalAttrs.version;
+    sha256 = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk=";
   };
 
   buildInputs = [ ncurses ];
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Tool to monitor network traffic based on processes";
-    license = licenses.gpl3;
     homepage = "https://github.com/berghetti/netproc";
-    platforms = platforms.linux;
+    license = licenses.gpl3;
+    mainProgram = "netproc";
     maintainers = [ maintainers.azuwis ];
+    platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2c5bbe1597..0111086b9e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11093,8 +11093,6 @@ with pkgs;
 
   netpbm = callPackage ../tools/graphics/netpbm { };
 
-  netproc = callPackage ../tools/networking/netproc { };
-
   netrw = callPackage ../tools/networking/netrw { };
 
   netselect = callPackage ../tools/networking/netselect { };