From 383cdf72790526d5f9aed9bcc4a297f35171398f Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 20 Apr 2023 08:32:51 +0000
Subject: [PATCH 1/2] flock: 0.2.3 -> 0.4.0

Diff: https://github.com/discoteq/flock/compare/v0.2.3...v0.4.0
---
 pkgs/development/tools/flock/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix
index a6ba410ec710..71ba58eedf9a 100644
--- a/pkgs/development/tools/flock/default.nix
+++ b/pkgs/development/tools/flock/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, ronn }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, ronn }:
 
 stdenv.mkDerivation rec {
   pname = "flock";
-  version = "0.2.3";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "discoteq";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vdq22zhdfi7wwndsd6s7fwmz02fsn0x04d7asq4hslk7bjxjjzn";
+    sha256 = "sha256-cCpckORtogs6Nt7c5q2+z0acXAnALdLV6uzxa5ng3s4=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ronn ];
 
+  patches = [
+    (fetchpatch {
+      name = "fix-format-specifier.patch";
+      url = "https://github.com/discoteq/flock/commit/408bad42eb8d76cdd0c504c2f97f21c0b424c3b1.patch";
+      sha256 = "sha256-YuFKXWTBu9A2kBNqkg1Oek6vDbVo/y8dB1k9Fuh3QmA";
+    })
+  ];
+
   meta = with lib; {
     description = "Cross-platform version of flock(1)";
     maintainers = [ maintainers.matthewbauer ];

From 4ff68cd6fdb0f38f95d07fe6344f64828f4dcc1b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 20 Apr 2023 08:33:46 +0000
Subject: [PATCH 2/2] flock: add msfjarvis to maintainers

---
 pkgs/development/tools/flock/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix
index 71ba58eedf9a..c9c71a9f8592 100644
--- a/pkgs/development/tools/flock/default.nix
+++ b/pkgs/development/tools/flock/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Cross-platform version of flock(1)";
-    maintainers = [ maintainers.matthewbauer ];
+    maintainers = with maintainers; [ matthewbauer msfjarvis ];
     platforms = platforms.all;
     license = licenses.isc;
   };