From d87a80752ad9e3f223e1a4535ff36c0c0e9a5c1b Mon Sep 17 00:00:00 2001
From: Steven Keuchel <steven.keuchel@gmail.com>
Date: Fri, 4 Oct 2024 20:35:38 +0200
Subject: [PATCH 1/4] mtdutils: apply nixfmt

---
 pkgs/tools/filesystems/mtdutils/default.nix | 36 +++++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index 3214694e5290..c2ceaf80b911 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,4 +1,16 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }:
+{
+  lib,
+  stdenv,
+  fetchgit,
+  autoreconfHook,
+  pkg-config,
+  cmocka,
+  acl,
+  libuuid,
+  lzo,
+  zlib,
+  zstd,
+}:
 
 stdenv.mkDerivation rec {
   pname = "mtd-utils";
@@ -10,8 +22,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-uYXzZnVL5PkyDAntH8YsocwmQ8tf1f0Vl78SdE2B+Oc=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka;
-  buildInputs = [ acl libuuid lzo zlib zstd ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ] ++ lib.optional doCheck cmocka;
+  buildInputs = [
+    acl
+    libuuid
+    lzo
+    zlib
+    zstd
+  ];
 
   enableParallelBuilding = true;
 
@@ -20,13 +41,14 @@ stdenv.mkDerivation rec {
     (lib.enableFeature doCheck "tests")
   ];
 
-  makeFlags = [
-    "AR:=$(AR)"
-  ];
+  makeFlags = [ "AR:=$(AR)" ];
 
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   postInstall = ''
     mkdir -p $dev/lib

From 10b278c83adaf3362f73d1f438b35206d836001d Mon Sep 17 00:00:00 2001
From: Steven Keuchel <steven.keuchel@gmail.com>
Date: Fri, 4 Oct 2024 20:37:30 +0200
Subject: [PATCH 2/4] mtdutils: migrate to by-name

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

diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/by-name/mt/mtdutils/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mtdutils/default.nix
rename to pkgs/by-name/mt/mtdutils/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5542da6fbc4f..d21ed160e420 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10185,8 +10185,6 @@ with pkgs;
 
   ms-sys = callPackage ../tools/misc/ms-sys { };
 
-  mtdutils = callPackage ../tools/filesystems/mtdutils { };
-
   mtools = callPackage ../tools/filesystems/mtools { };
 
   mtr = callPackage ../tools/networking/mtr { };

From e459735ee0db34bb428f40b002b0a980c79a1eca Mon Sep 17 00:00:00 2001
From: Steven Keuchel <steven.keuchel@gmail.com>
Date: Fri, 4 Oct 2024 20:41:52 +0200
Subject: [PATCH 3/4] mtdutils: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/mt/mtdutils/package.nix b/pkgs/by-name/mt/mtdutils/package.nix
index c2ceaf80b911..1b399d3c4135 100644
--- a/pkgs/by-name/mt/mtdutils/package.nix
+++ b/pkgs/by-name/mt/mtdutils/package.nix
@@ -14,12 +14,12 @@
 
 stdenv.mkDerivation rec {
   pname = "mtd-utils";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchgit {
     url = "git://git.infradead.org/mtd-utils.git";
     rev = "v${version}";
-    hash = "sha256-uYXzZnVL5PkyDAntH8YsocwmQ8tf1f0Vl78SdE2B+Oc=";
+    hash = "sha256-vGgBOKu+ClmyRZHQkAS8r/YJtZihr/oD/yj8V7DeAQ8=";
   };
 
   nativeBuildInputs = [

From ca009870032d9d93a2753c9e698f9a95d5062966 Mon Sep 17 00:00:00 2001
From: Steven Keuchel <steven.keuchel@gmail.com>
Date: Mon, 7 Oct 2024 05:13:51 +0200
Subject: [PATCH 4/4] mtdutils: replace hardcoded /bin/mount in mount.ubifs

---
 pkgs/by-name/mt/mtdutils/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/mt/mtdutils/package.nix b/pkgs/by-name/mt/mtdutils/package.nix
index 1b399d3c4135..15359970cfca 100644
--- a/pkgs/by-name/mt/mtdutils/package.nix
+++ b/pkgs/by-name/mt/mtdutils/package.nix
@@ -8,6 +8,7 @@
   acl,
   libuuid,
   lzo,
+  util-linux,
   zlib,
   zstd,
 }:
@@ -30,10 +31,16 @@ stdenv.mkDerivation rec {
     acl
     libuuid
     lzo
+    util-linux
     zlib
     zstd
   ];
 
+  postPatch = ''
+    substituteInPlace ubifs-utils/mount.ubifs \
+      --replace-fail "/bin/mount" "${util-linux}/bin/mount"
+  '';
+
   enableParallelBuilding = true;
 
   configureFlags = [