From 89f298ca500e9804ddc47ccf4d1b3dd29592fd3a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 20 Apr 2026 12:49:15 -0500 Subject: [PATCH 1/3] wpa_supplicant_gui: migrate to by-name --- .../wp/wpa_supplicant_gui/package.nix} | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/{os-specific/linux/wpa_supplicant/gui.nix => by-name/wp/wpa_supplicant_gui/package.nix} (88%) diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/by-name/wp/wpa_supplicant_gui/package.nix similarity index 88% rename from pkgs/os-specific/linux/wpa_supplicant/gui.nix rename to pkgs/by-name/wp/wpa_supplicant_gui/package.nix index b91d46bca6a6..efb73f3fe865 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/by-name/wp/wpa_supplicant_gui/package.nix @@ -1,11 +1,9 @@ { lib, stdenv, - qtbase, - qmake, + qt5, inkscape, imagemagick, - wrapQtAppsHook, wpa_supplicant, }: @@ -13,12 +11,15 @@ stdenv.mkDerivation { pname = "wpa_gui"; inherit (wpa_supplicant) version src patches; - buildInputs = [ qtbase ]; + buildInputs = [ + qt5.qtbase + ]; + nativeBuildInputs = [ - qmake + qt5.qmake inkscape imagemagick - wrapQtAppsHook + qt5.wrapQtAppsHook ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312d732b0ba0..e835f5cee1ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8661,8 +8661,6 @@ with pkgs; wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; - wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; - inherit ({ zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix { From 71a6fd4712c7ba7784542042f1d48804503d105a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 20 Apr 2026 12:53:03 -0500 Subject: [PATCH 2/3] wpa_supplicant: migrate to by-name --- .../linux => by-name/wp}/wpa_supplicant/multiple-configs.patch | 0 .../default.nix => by-name/wp/wpa_supplicant/package.nix} | 0 .../wp}/wpa_supplicant/unprivileged-daemon.patch | 0 .../wp}/wpa_supplicant/unsurprising-ext-password.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{os-specific/linux => by-name/wp}/wpa_supplicant/multiple-configs.patch (100%) rename pkgs/{os-specific/linux/wpa_supplicant/default.nix => by-name/wp/wpa_supplicant/package.nix} (100%) rename pkgs/{os-specific/linux => by-name/wp}/wpa_supplicant/unprivileged-daemon.patch (100%) rename pkgs/{os-specific/linux => by-name/wp}/wpa_supplicant/unsurprising-ext-password.patch (100%) diff --git a/pkgs/os-specific/linux/wpa_supplicant/multiple-configs.patch b/pkgs/by-name/wp/wpa_supplicant/multiple-configs.patch similarity index 100% rename from pkgs/os-specific/linux/wpa_supplicant/multiple-configs.patch rename to pkgs/by-name/wp/wpa_supplicant/multiple-configs.patch diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/by-name/wp/wpa_supplicant/package.nix similarity index 100% rename from pkgs/os-specific/linux/wpa_supplicant/default.nix rename to pkgs/by-name/wp/wpa_supplicant/package.nix diff --git a/pkgs/os-specific/linux/wpa_supplicant/unprivileged-daemon.patch b/pkgs/by-name/wp/wpa_supplicant/unprivileged-daemon.patch similarity index 100% rename from pkgs/os-specific/linux/wpa_supplicant/unprivileged-daemon.patch rename to pkgs/by-name/wp/wpa_supplicant/unprivileged-daemon.patch diff --git a/pkgs/os-specific/linux/wpa_supplicant/unsurprising-ext-password.patch b/pkgs/by-name/wp/wpa_supplicant/unsurprising-ext-password.patch similarity index 100% rename from pkgs/os-specific/linux/wpa_supplicant/unsurprising-ext-password.patch rename to pkgs/by-name/wp/wpa_supplicant/unsurprising-ext-password.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e835f5cee1ed..e15e06a2aa16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8659,8 +8659,6 @@ with pkgs; cygwin = recurseIntoAttrs (callPackages ../os-specific/cygwin { }); - wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; - inherit ({ zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix { From 658641976abbc562c5afd7b68402c315ad7bf018 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 20 Apr 2026 12:54:55 -0500 Subject: [PATCH 3/3] wpa_supplicant: modernize derivation --- pkgs/by-name/wp/wpa_supplicant/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wp/wpa_supplicant/package.nix b/pkgs/by-name/wp/wpa_supplicant/package.nix index 64c3e9c0bf75..7fe7be234199 100644 --- a/pkgs/by-name/wp/wpa_supplicant/package.nix +++ b/pkgs/by-name/wp/wpa_supplicant/package.nix @@ -17,14 +17,14 @@ unprivileged ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.11"; pname = "wpa_supplicant"; src = fetchurl { - url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-kS6gb3TjCo42+7aAZNbN/yGNjVkdsPxddd7myBrH/Ao="; + url = "https://w1.fi/releases/wpa_supplicant-${finalAttrs.version}.tar.gz"; + hash = "sha256-kS6gb3TjCo42+7aAZNbN/yGNjVkdsPxddd7myBrH/Ao="; }; patches = [ @@ -178,6 +178,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; - identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "w1.fi" version; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "w1.fi" finalAttrs.version; }; -} +})