From 0b43348b0679f6bf92054e4b56e23e6feef5e45a Mon Sep 17 00:00:00 2001
From: Tomo <68489118+tomodachi94@users.noreply.github.com>
Date: Mon, 20 May 2024 15:50:29 -0700
Subject: [PATCH 1/4] mpack: move to pkgs/by-name/mp

---
 pkgs/{tools/networking => by-name/mp}/mpack/CVE-2011-4919.patch | 0
 pkgs/{tools/networking => by-name/mp}/mpack/build-fix.patch     | 0
 .../mpack/default.nix => by-name/mp/mpack/package.nix}          | 0
 .../networking => by-name/mp}/mpack/sendmail-via-execvp.diff    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/networking => by-name/mp}/mpack/CVE-2011-4919.patch (100%)
 rename pkgs/{tools/networking => by-name/mp}/mpack/build-fix.patch (100%)
 rename pkgs/{tools/networking/mpack/default.nix => by-name/mp/mpack/package.nix} (100%)
 rename pkgs/{tools/networking => by-name/mp}/mpack/sendmail-via-execvp.diff (100%)

diff --git a/pkgs/tools/networking/mpack/CVE-2011-4919.patch b/pkgs/by-name/mp/mpack/CVE-2011-4919.patch
similarity index 100%
rename from pkgs/tools/networking/mpack/CVE-2011-4919.patch
rename to pkgs/by-name/mp/mpack/CVE-2011-4919.patch
diff --git a/pkgs/tools/networking/mpack/build-fix.patch b/pkgs/by-name/mp/mpack/build-fix.patch
similarity index 100%
rename from pkgs/tools/networking/mpack/build-fix.patch
rename to pkgs/by-name/mp/mpack/build-fix.patch
diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/by-name/mp/mpack/package.nix
similarity index 100%
rename from pkgs/tools/networking/mpack/default.nix
rename to pkgs/by-name/mp/mpack/package.nix
diff --git a/pkgs/tools/networking/mpack/sendmail-via-execvp.diff b/pkgs/by-name/mp/mpack/sendmail-via-execvp.diff
similarity index 100%
rename from pkgs/tools/networking/mpack/sendmail-via-execvp.diff
rename to pkgs/by-name/mp/mpack/sendmail-via-execvp.diff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce162c99e57e..6a5a2b12f8fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11011,8 +11011,6 @@ with pkgs;
 
   mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { };
 
-  mpack = callPackage ../tools/networking/mpack { };
-
   mtm = callPackage ../tools/misc/mtm { };
 
   op-geth = callPackage ../applications/blockchains/optimism/geth.nix {

From 86a7622c74a862e124adc0f1f510a1f1b89311b5 Mon Sep 17 00:00:00 2001
From: Tomo <68489118+tomodachi94@users.noreply.github.com>
Date: Mon, 20 May 2024 15:51:54 -0700
Subject: [PATCH 2/4] mpack: format with nixfmt-rfc-style

---
 pkgs/by-name/mp/mpack/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mp/mpack/package.nix b/pkgs/by-name/mp/mpack/package.nix
index 669ef500c455..3722d5c610e2 100644
--- a/pkgs/by-name/mp/mpack/package.nix
+++ b/pkgs/by-name/mp/mpack/package.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchurl }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
 
 stdenv.mkDerivation rec {
   pname = "mpack";
@@ -9,7 +13,11 @@ stdenv.mkDerivation rec {
     sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97";
   };
 
-  patches = [ ./build-fix.patch ./sendmail-via-execvp.diff ./CVE-2011-4919.patch ];
+  patches = [
+    ./build-fix.patch
+    ./sendmail-via-execvp.diff
+    ./CVE-2011-4919.patch
+  ];
 
   postPatch = ''
     for f in *.{c,man,pl,unix} ; do

From 84b113b900e65f0434a9847222f3f0ad440df552 Mon Sep 17 00:00:00 2001
From: Tomo <68489118+tomodachi94@users.noreply.github.com>
Date: Mon, 20 May 2024 15:52:12 -0700
Subject: [PATCH 3/4] mpack: adopt

---
 pkgs/by-name/mp/mpack/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mp/mpack/package.nix b/pkgs/by-name/mp/mpack/package.nix
index 3722d5c610e2..1f1de3817ff7 100644
--- a/pkgs/by-name/mp/mpack/package.nix
+++ b/pkgs/by-name/mp/mpack/package.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     description = "Utilities for encoding and decoding binary files in MIME";
     license = licenses.free;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ tomodachi94 ];
   };
 }

From c2e1c242f469f2d11c6a077ee2de4b1e26701905 Mon Sep 17 00:00:00 2001
From: Tomo <68489118+Tomodachi94@users.noreply.github.com>
Date: Mon, 20 May 2024 16:03:31 -0700
Subject: [PATCH 4/4] mpack: add passthru.tests.version

---
 pkgs/by-name/mp/mpack/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/mp/mpack/package.nix b/pkgs/by-name/mp/mpack/package.nix
index 1f1de3817ff7..d428fbe664c9 100644
--- a/pkgs/by-name/mp/mpack/package.nix
+++ b/pkgs/by-name/mp/mpack/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  testers,
+  mpack,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,6 +38,16 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru.tests = {
+    version = testers.testVersion {
+      command = ''
+        mpack 2>&1 || echo "mpack exited with error code $?"
+      '';
+      package = mpack;
+      version = "mpack version ${version}";
+    };
+  };
+
   meta = with lib; {
     description = "Utilities for encoding and decoding binary files in MIME";
     license = licenses.free;