From 16696db425184692aec2158eb5ec96917bbd7a8d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 2 Jun 2025 09:15:42 +0200
Subject: [PATCH 1/2] firefox-bin: remove with lib;

---
 .../networking/browsers/firefox-bin/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 9e3b2c7f820f..1d2dfc1f5ef5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation {
     };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
     description = "Mozilla Firefox, free web browser (binary package)";
     homepage = "https://www.mozilla.org/firefox/";
@@ -188,10 +188,10 @@ stdenv.mkDerivation {
       free = false;
       redistributable = true; # since MPL-2.0 still applies
     };
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = builtins.attrNames mozillaPlatforms;
     hydraPlatforms = [ ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       taku0
       lovesegfault
     ];

From f42c9668cb15b736780fe39ab44d0b0002e072d7 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 2 Jun 2025 09:19:50 +0200
Subject: [PATCH 2/2] avrdudess: use finalAttrs pattern, cleanup

---
 pkgs/by-name/av/avrdudess/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/av/avrdudess/package.nix b/pkgs/by-name/av/avrdudess/package.nix
index 6f767e3ae944..a50c3c0eada2 100644
--- a/pkgs/by-name/av/avrdudess/package.nix
+++ b/pkgs/by-name/av/avrdudess/package.nix
@@ -10,13 +10,13 @@
   xdg-utils,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avrdudess";
   version = "2.18";
 
   src = fetchurl {
-    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.18/AVRDUDESS-2.18-portable.zip";
-    sha256 = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc=";
+    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v${finalAttrs.version}/AVRDUDESS-${finalAttrs.version}-portable.zip";
+    hash = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc=";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
   dontInstall = true;
 
   buildPhase = ''
+    runHook preBuild
+
     mkdir -p "$out/avrdudess"
     mkdir -p "$out/bin"
 
@@ -52,15 +54,17 @@ stdenv.mkDerivation {
     __EOF__
 
     chmod a+x "$out/bin/"*
+
+    runHook postBuild
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GUI for AVRDUDE (AVR microcontroller programmer)";
     homepage = "https://blog.zakkemble.net/avrdudess-a-gui-for-avrdude/";
-    changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${version}/Changelog.txt";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${finalAttrs.version}/Changelog.txt";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.bjornfor ];
     mainProgram = "avrdudess";
   };
-}
+})