From bed919271ea1ea001f68a84b5a6cf2caade5f632 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 14 May 2024 18:39:23 +0100
Subject: [PATCH] goflow2: move to by-name

---
 .../go/goflow2/package.nix}                       | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename pkgs/{tools/networking/goflow2/default.nix => by-name/go/goflow2/package.nix} (75%)

diff --git a/pkgs/tools/networking/goflow2/default.nix b/pkgs/by-name/go/goflow2/package.nix
similarity index 75%
rename from pkgs/tools/networking/goflow2/default.nix
rename to pkgs/by-name/go/goflow2/package.nix
index 6edd9b87f657..e360c5253ef9 100644
--- a/pkgs/tools/networking/goflow2/default.nix
+++ b/pkgs/by-name/go/goflow2/package.nix
@@ -3,13 +3,16 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-buildGoModule rec {
-  pname = "goflow2";
+let
   version = "2.1.3";
+in
+buildGoModule {
+  pname = "goflow2";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "netsampler";
-    repo = pname;
+    repo = "goflow2";
     rev = "v${version}";
     hash = "sha256-wtvBkk+Y4koGDGN+N/w4FsdejgpCIio0g2QV35Pr/fo=";
   };
@@ -22,10 +25,10 @@ buildGoModule rec {
 
   vendorHash = "sha256-qcWeIg278V2bgFGpWwUT5JCblxfBv0/gWV1oXul/nCQ=";
 
-  meta = with lib; {
+  meta = {
     description = "High performance sFlow/IPFIX/NetFlow Collector";
     homepage = "https://github.com/netsampler/goflow2";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ isabelroses ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ isabelroses ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70c7e48a82bb..d97be74a0d8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1841,8 +1841,6 @@ with pkgs;
 
   goflow = callPackage ../tools/networking/goflow { };
 
-  goflow2 = callPackage ../tools/networking/goflow2 { };
-
   gofu = callPackage ../applications/misc/gofu { };
 
   godspeed = callPackage ../tools/networking/godspeed { };