From 2544371869fa0674f52f6d3fea32cb190d388539 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 19 Jun 2025 12:09:35 +0200
Subject: [PATCH 1/4] iwd: use finalAttrs

---
 pkgs/by-name/iw/iwd/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index daf2372f6015..d6935a8cd9bd 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -13,13 +13,13 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "iwd";
   version = "3.8";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-BNGXOiyV+aTHym4EBStVdQ0XekmkFEyx7PqmlG8HcVc=";
   };
 
@@ -101,14 +101,14 @@ stdenv.mkDerivation rec {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     description = "Wireless daemon for Linux";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       dtzWill
       fpletz
     ];
   };
-}
+})

From 07477ca0e680f49ae490800fae8aaadb658ce9db Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 19 Jun 2025 12:09:58 +0200
Subject: [PATCH 2/4] iwd: 3.8 -> 3.9

---
 pkgs/by-name/iw/iwd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index d6935a8cd9bd..a0e3836b0b76 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -15,12 +15,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "iwd";
-  version = "3.8";
+  version = "3.9";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = finalAttrs.version;
-    hash = "sha256-BNGXOiyV+aTHym4EBStVdQ0XekmkFEyx7PqmlG8HcVc=";
+    hash = "sha256-NY0WB62ehxKH64ssAF4vkF6YroG5HHH+ii+AFG9EaE4=";
   };
 
   outputs = [

From 88565ccffd1ede1a91f1bdd23b66125b461ce585 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 19 Jun 2025 12:10:18 +0200
Subject: [PATCH 3/4] iwd: avoid error in the logs about a non-existing netdev
 group

---
 pkgs/by-name/iw/iwd/no_netdev_group.diff | 30 ++++++++++++++++++++++++
 pkgs/by-name/iw/iwd/package.nix          |  6 +++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/iw/iwd/no_netdev_group.diff

diff --git a/pkgs/by-name/iw/iwd/no_netdev_group.diff b/pkgs/by-name/iw/iwd/no_netdev_group.diff
new file mode 100644
index 000000000000..45c545f452e4
--- /dev/null
+++ b/pkgs/by-name/iw/iwd/no_netdev_group.diff
@@ -0,0 +1,30 @@
+diff --git a/src/iwd-dbus.conf b/src/iwd-dbus.conf
+index f2509ebc..a443987d 100644
+--- a/src/iwd-dbus.conf
++++ b/src/iwd-dbus.conf
+@@ -19,10 +19,6 @@
+     <allow send_destination="net.connman.iwd"/>
+   </policy>
+ 
+-  <policy group="netdev">
+-    <allow send_destination="net.connman.iwd"/>
+-  </policy>
+-
+   <policy context="default">
+     <deny send_destination="net.connman.iwd"/>
+   </policy>
+diff --git a/wired/ead-dbus.conf b/wired/ead-dbus.conf
+index 8a685e0a..749d0c05 100644
+--- a/wired/ead-dbus.conf
++++ b/wired/ead-dbus.conf
+@@ -17,10 +17,6 @@
+     <allow send_destination="net.connman.ead"/>
+   </policy>
+ 
+-  <policy group="netdev">
+-    <allow send_destination="net.connman.ead"/>
+-  </policy>
+-
+   <policy context="default">
+     <deny send_destination="net.connman.ead"/>
+   </policy>
diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index a0e3836b0b76..5cb920a6e4ea 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-NY0WB62ehxKH64ssAF4vkF6YroG5HHH+ii+AFG9EaE4=";
   };
 
+  patches = [
+    # Remove dbus config referencing the netdev group, which we don't have.
+    # Users are advised to use the wheel group instead.
+    ./no_netdev_group.diff
+  ];
+
   outputs = [
     "out"
     "man"

From b6596b40bb4b40d4deb3f793bba8439d7e1a08dc Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 19 Jun 2025 17:13:59 +0200
Subject: [PATCH 4/4] iwd: src.rev -> src.tag

---
 pkgs/by-name/iw/iwd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix
index 5cb920a6e4ea..11c1522c747d 100644
--- a/pkgs/by-name/iw/iwd/package.nix
+++ b/pkgs/by-name/iw/iwd/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NY0WB62ehxKH64ssAF4vkF6YroG5HHH+ii+AFG9EaE4=";
   };