From 0a1589e5cf08eea7bc5f104d07fe6e8fd8d497db Mon Sep 17 00:00:00 2001
From: mackb <mackbinns@gmail.com>
Date: Fri, 2 Jan 2026 13:24:33 -0800
Subject: [PATCH 1/2] maintainers: add mbinns

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a85a897ebb48..53ce3f408b58 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16666,6 +16666,12 @@
     githubId = 396449;
     name = "Brandon Edens";
   };
+  mbinns = {
+    email = "mack@yourdata.rip";
+    github = "mbinns";
+    githubId = 14008591;
+    name = "Mack Binns";
+  };
   mbode = {
     email = "maxbode@gmail.com";
     github = "mbode";

From 2772a883a96441ae80067cfe948a945d197e5dc3 Mon Sep 17 00:00:00 2001
From: mackb <mackbinns@gmail.com>
Date: Fri, 2 Jan 2026 13:08:55 -0800
Subject: [PATCH 2/2] dfu-programmer: 0.7.2 -> 1.1.0

Fixes migration to GCC 15 and the gnu23 reserved words errors
https://github.com/NixOS/nixpkgs/issues/475479
---
 pkgs/by-name/df/dfu-programmer/package.nix | 48 ++++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/df/dfu-programmer/package.nix b/pkgs/by-name/df/dfu-programmer/package.nix
index 404804530ea1..c9ef940dca54 100644
--- a/pkgs/by-name/df/dfu-programmer/package.nix
+++ b/pkgs/by-name/df/dfu-programmer/package.nix
@@ -1,29 +1,51 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  libusb-compat-0_1,
+  fetchFromGitHub,
+  autoreconfHook,
+  libusb1,
+  nix-update-script,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dfu-programmer";
-  version = "0.7.2";
+  version = "1.1.0";
 
-  buildInputs = [ libusb-compat-0_1 ];
-
-  src = fetchurl {
-    url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
-    sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
+  src = fetchFromGitHub {
+    owner = "dfu-programmer";
+    repo = "dfu-programmer";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-YhiBD8rpzEVVaP3Rdfq74lhZ0Mu7OEbrMsM3fBL1Kvk";
   };
 
-  configureFlags = [ "--disable-libusb_1_0" ];
+  buildInputs = [
+    libusb1
+  ];
 
-  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  # No build configured in source, automake requires ChangeLog to exist
+  preAutoreconf = ''
+    touch ChangeLog
+  '';
+
+  postPatch = ''
+    patchShebangs --build bootstrap.sh
+    patchShebangs --build update-bash-completion.sh
+  '';
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     license = lib.licenses.gpl2;
     description = "Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
     mainProgram = "dfu-programmer";
-    homepage = "http://dfu-programmer.sourceforge.net/";
+    homepage = "https://github.com/dfu-programmer/dfu-programmer";
+    maintainers = with lib.maintainers; [
+      mbinns
+      cybardev
+    ];
     platforms = lib.platforms.unix;
   };
-}
+})