From bc4de002cffe010be2a15d6aa687a4fd1942a668 Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Mon, 10 Mar 2025 00:58:11 -0500
Subject: [PATCH] infnoise: 0.3.2 -> 0.3.3

---
 pkgs/by-name/in/infnoise/makefile.patch | 14 --------------
 pkgs/by-name/in/infnoise/package.nix    | 19 +++++++++----------
 2 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/by-name/in/infnoise/makefile.patch

diff --git a/pkgs/by-name/in/infnoise/makefile.patch b/pkgs/by-name/in/infnoise/makefile.patch
deleted file mode 100644
index 871a6c508ce6..000000000000
--- a/pkgs/by-name/in/infnoise/makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/software/Makefile.linux b/software/Makefile.linux
-index db48aa5..df8b3d2 100644
---- a/software/Makefile.linux
-+++ b/software/Makefile.linux
-@@ -1,6 +1,6 @@
--GIT_VERSION := $(shell git --no-pager describe --tags --always)
--GIT_COMMIT  := $(shell git rev-parse --verify HEAD)
--GIT_DATE    := $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
-+GIT_VERSION ?= $(shell git --no-pager describe --tags --always)
-+GIT_COMMIT  ?= $(shell git rev-parse --verify HEAD)
-+GIT_DATE    ?= $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
- 
- PREFIX = $(DESTDIR)/usr/local
- 
diff --git a/pkgs/by-name/in/infnoise/package.nix b/pkgs/by-name/in/infnoise/package.nix
index c596f9e76c79..08ee53e739f1 100644
--- a/pkgs/by-name/in/infnoise/package.nix
+++ b/pkgs/by-name/in/infnoise/package.nix
@@ -9,29 +9,26 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "infnoise";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "leetronics";
     repo = "infnoise";
-    rev = "e80ddd78085abf3d06df2e0d8c08fd33dade78eb";
-    sha256 = "sha256-9MKG1InkV+yrQPBTgi2gZJ3y9Fokb6WbxuAnM7n7FyA=";
+    rev = "19bb69894724d87b32b7b9b86022bb4b26c919f8";
+    sha256 = "sha256-O2P4uOwO7wKLYLufdW3KQeyuFBoQPdSepnTUeq0CSJY=";
   };
 
   patches = [
-    # Patch makefile so we can set defines from the command line instead of it depending on .git
-    ./makefile.patch
-
-    # Fix getc return type
+    # Patch providing version info at compile time
     (fetchpatch {
-      url = "https://github.com/leetronics/infnoise/commit/7ed7014e14253311c07e530c8f89f1c8f4705c2b.patch";
-      sha256 = "sha256-seB/fJaxQ/rXJp5iPtnobXXOccQ2KUAk6HFx31dhOhs=";
+      url = "https://github.com/leetronics/infnoise/commit/04d52a975bf78d2aff2bb4c176c286715e1948ba.patch";
+      sha256 = "sha256-vtPAR6gCyny9UP+U6/7X8CPEUuMDl7RIyICIwiaWyfc=";
     })
   ];
 
   GIT_COMMIT = finalAttrs.src.rev;
   GIT_VERSION = finalAttrs.version;
-  GIT_DATE = "2019-08-12";
+  GIT_DATE = "2023-02-14";
 
   buildInputs = [ libftdi ];
 
@@ -44,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     make -C tools
+    # 2e6cfbe made findlongest executable, but it's a C file
+    chmod -x tools/*.c
     find ./tools/ -executable -type f -exec \
       sh -c "install -Dm755 {} $out/bin/infnoise-\$(basename {})" \;
   '';