From 67c802bb1ebe2d805f2fe996940d64a13395dcf5 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 14 Jun 2024 14:48:20 -0300
Subject: [PATCH 1/3] megatools: migrate to by-name

---
 .../megatools/default.nix => by-name/me/megatools/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/megatools/default.nix => by-name/me/megatools/package.nix} (100%)

diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/by-name/me/megatools/package.nix
similarity index 100%
rename from pkgs/tools/networking/megatools/default.nix
rename to pkgs/by-name/me/megatools/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84cae899cd6dd..c2a35e32ba054 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10378,8 +10378,6 @@ with pkgs;
 
   megacli = callPackage ../tools/misc/megacli { };
 
-  megatools = callPackage ../tools/networking/megatools { };
-
   memo = callPackage ../applications/misc/memo { };
 
   mencal = callPackage ../applications/misc/mencal { } ;

From b64394b4fd2bc9877ca27617ac312998635ec6fc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 14 Jun 2024 14:53:20 -0300
Subject: [PATCH 2/3] megatools: refactor

- get rid of nested with
- split outputs
- remove viric from maintainers
---
 pkgs/by-name/me/megatools/package.nix | 52 +++++++++++++++------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix
index 2fbd7e88466b9..1661b84a15e28 100644
--- a/pkgs/by-name/me/megatools/package.nix
+++ b/pkgs/by-name/me/megatools/package.nix
@@ -1,32 +1,35 @@
-{ lib
-, stdenv
-, fetchgit
-, asciidoc
-, docbook_xml_dtd_45
-, docbook2x
-, libxml2
-, meson
-, ninja
-, pkg-config
-, curl
-, glib
-, fuse
+{
+  lib,
+  asciidoc,
+  curl,
+  docbook2x,
+  docbook_xml_dtd_45,
+  fetchgit,
+  fuse,
+  glib,
+  libxml2,
+  meson,
+  ninja,
+  pkg-config,
+  stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "megatools";
   version = "1.11.0";
 
   src = fetchgit {
     url = "https://megous.com/git/megatools";
-    rev = version;
-    sha256 = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s=";
+    rev = finalAttrs.version;
+    hash = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s=";
   };
 
+  outputs = [ "out" "doc" "man" ];
+
   nativeBuildInputs = [
     asciidoc
-    docbook_xml_dtd_45
     docbook2x
+    docbook_xml_dtd_45
     libxml2
     meson
     ninja
@@ -36,16 +39,21 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     glib
-  ] ++ lib.optionals stdenv.isLinux [ fuse ];
+  ] ++ lib.optionals stdenv.isLinux [
+    fuse
+  ];
 
   enableParallelBuilding = true;
+
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Command line client for Mega.co.nz";
     homepage = "https://megatools.megous.com/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric AndersonTorres ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "megatools";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
   };
 }
+)

From 1201062e52f2839a2a1846525db79edbc37a6919 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 14 Jun 2024 15:00:05 -0300
Subject: [PATCH 3/3] megatools: 1.11.0 -> 1.11.1

---
 pkgs/by-name/me/megatools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix
index 1661b84a15e28..271f71f348379 100644
--- a/pkgs/by-name/me/megatools/package.nix
+++ b/pkgs/by-name/me/megatools/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "megatools";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchgit {
     url = "https://megous.com/git/megatools";
     rev = finalAttrs.version;
-    hash = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s=";
+    hash = "sha256-AdvQqaRTsKTqdfNfFiWtA9mIPVGuui+Ru9TUARVG0+Q=";
   };
 
   outputs = [ "out" "doc" "man" ];