From 73a991196dda93c2da3a6277a2f21241dcf17e5c Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Tue, 9 Jun 2026 23:00:31 +0200
Subject: [PATCH 1/6] andcli: set __structuredAttrs

---
 pkgs/by-name/an/andcli/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix
index cc2d1bd4dfcb..f06566d534fc 100644
--- a/pkgs/by-name/an/andcli/package.nix
+++ b/pkgs/by-name/an/andcli/package.nix
@@ -11,6 +11,8 @@ buildGoModule (finalAttrs: {
   pname = "andcli";
   version = "2.7.0";
 
+  __structuredAttrs = true;
+
   subPackages = [ "cmd/andcli" ];
 
   src = fetchFromGitHub {

From 87e68dd9d798abdc5753f69042624025dbbce1ec Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Wed, 10 Jun 2026 17:47:12 +0200
Subject: [PATCH 2/6] gradia: set __structuredAttrs

---
 pkgs/by-name/gr/gradia/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix
index 1aa6761b181d..b4766d61f9e7 100644
--- a/pkgs/by-name/gr/gradia/package.nix
+++ b/pkgs/by-name/gr/gradia/package.nix
@@ -27,6 +27,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   version = "1.13.0";
   pyproject = false;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "AlexanderVanhee";
     repo = "Gradia";
@@ -79,7 +81,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   dontWrapGApps = true;
 
-  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
 
   passthru.updateScript = nix-update-script { };
 

From dcf6a8c0ee3ced62d267f3d6fdcadf0fc398b892 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Tue, 9 Jun 2026 22:53:03 +0200
Subject: [PATCH 3/6] netpeek: set __structuredAttrs

---
 pkgs/by-name/ne/netpeek/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix
index 23564c756a7a..f4442e1908a4 100644
--- a/pkgs/by-name/ne/netpeek/package.nix
+++ b/pkgs/by-name/ne/netpeek/package.nix
@@ -17,6 +17,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   version = "0.2.7";
   pyproject = false;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "ZingyTomato";
     repo = "NetPeek";

From 3428ea4fb8445a74f5b8562e8e1a2d7f1cd96ee9 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Tue, 9 Jun 2026 22:53:49 +0200
Subject: [PATCH 4/6] jocalsend: set __structuredAttrs

---
 pkgs/by-name/jo/jocalsend/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix
index 11af40e879ca..ad86d22c6a19 100644
--- a/pkgs/by-name/jo/jocalsend/package.nix
+++ b/pkgs/by-name/jo/jocalsend/package.nix
@@ -11,6 +11,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jocalsend";
   version = "1.618033988";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitea {
     domain = "git.kittencollective.com";
     owner = "nebkor";

From b1cdb7273b59bbcee2c9ba465f68f24d30cfba25 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Tue, 9 Jun 2026 22:54:45 +0200
Subject: [PATCH 5/6] librepods: set __structuredAttrs & strictDeps

---
 pkgs/by-name/li/librepods/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix
index 180d130f621a..6ec5dd872703 100644
--- a/pkgs/by-name/li/librepods/package.nix
+++ b/pkgs/by-name/li/librepods/package.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "librepods";
   version = "0.2.5";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchFromGitHub {
     owner = "kavishdevar";
     repo = "librepods";

From 13f9a2811def39373334851e408a5a6fb822e0e2 Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <cameo007@mintux.de>
Date: Wed, 10 Jun 2026 17:47:35 +0200
Subject: [PATCH 6/6] tauno-monitor: set __structuredAttrs

---
 pkgs/by-name/ta/tauno-monitor/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix
index 9631bd23d3b7..9a02cdd189b5 100644
--- a/pkgs/by-name/ta/tauno-monitor/package.nix
+++ b/pkgs/by-name/ta/tauno-monitor/package.nix
@@ -17,6 +17,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   version = "0.2.20";
   pyproject = false;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "taunoe";
     repo = "tauno-monitor";
@@ -45,7 +47,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   dontWrapGApps = true;
 
-  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
 
   passthru.updateScript = nix-update-script { };