From d70501ed662d4c46ae3ac157a126531bc44442eb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 11 Apr 2026 11:53:24 -0500
Subject: [PATCH 1/2] riseup-vpn: migrate to by-name, preserve overrides

---
 .../ri/riseup-vpn}/build_release.patch        |  0
 .../ri/riseup-vpn}/fix_paths.patch            |  0
 .../ri/riseup-vpn}/gui_gui_qmlcache.qrc       |  0
 .../ri/riseup-vpn/package.nix}                | 28 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 ---
 5 files changed, 11 insertions(+), 21 deletions(-)
 rename pkgs/{tools/networking/bitmask-vpn => by-name/ri/riseup-vpn}/build_release.patch (100%)
 rename pkgs/{tools/networking/bitmask-vpn => by-name/ri/riseup-vpn}/fix_paths.patch (100%)
 rename pkgs/{tools/networking/bitmask-vpn => by-name/ri/riseup-vpn}/gui_gui_qmlcache.qrc (100%)
 rename pkgs/{tools/networking/bitmask-vpn/default.nix => by-name/ri/riseup-vpn/package.nix} (94%)

diff --git a/pkgs/tools/networking/bitmask-vpn/build_release.patch b/pkgs/by-name/ri/riseup-vpn/build_release.patch
similarity index 100%
rename from pkgs/tools/networking/bitmask-vpn/build_release.patch
rename to pkgs/by-name/ri/riseup-vpn/build_release.patch
diff --git a/pkgs/tools/networking/bitmask-vpn/fix_paths.patch b/pkgs/by-name/ri/riseup-vpn/fix_paths.patch
similarity index 100%
rename from pkgs/tools/networking/bitmask-vpn/fix_paths.patch
rename to pkgs/by-name/ri/riseup-vpn/fix_paths.patch
diff --git a/pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc b/pkgs/by-name/ri/riseup-vpn/gui_gui_qmlcache.qrc
similarity index 100%
rename from pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc
rename to pkgs/by-name/ri/riseup-vpn/gui_gui_qmlcache.qrc
diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/by-name/ri/riseup-vpn/package.nix
similarity index 94%
rename from pkgs/tools/networking/bitmask-vpn/default.nix
rename to pkgs/by-name/ri/riseup-vpn/package.nix
index 70c52da296f9..cfb2b5d98fc4 100644
--- a/pkgs/tools/networking/bitmask-vpn/default.nix
+++ b/pkgs/by-name/ri/riseup-vpn/package.nix
@@ -5,22 +5,16 @@
   git,
   fetchFromGitLab,
   buildGoModule,
-  wrapQtAppsHook,
   python3,
   python3Packages,
   pkg-config,
   openvpn,
   cmake,
-  qmake,
   which,
   iproute2,
   iptables,
   procps,
-  qtbase,
-  qtdeclarative,
-  qtsvg,
-  qttools,
-  qtwayland,
+  qt6,
   provider ? "riseup",
 }:
 
@@ -41,7 +35,7 @@ buildGoModule (finalAttrs: {
     # This patch fixes the paths in the build script generated by qmake
     # to use the correct paths for qmlcachegen and lrelease
     (replaceVars ./fix_paths.patch {
-      inherit qtbase qtdeclarative qttools;
+      inherit (qt6) qtbase qtdeclarative qttools;
     })
 
     # Don't build the debug version
@@ -80,23 +74,23 @@ buildGoModule (finalAttrs: {
     python3
     python3Packages.wrapPython
     which
-    wrapQtAppsHook
-    qmake
-    qttools
-    qtsvg
+    qt6.wrapQtAppsHook
+    qt6.qmake
+    qt6.qttools
+    qt6.qtsvg
   ];
 
   buildInputs = [
-    qtbase
-    qtdeclarative
-    qtsvg
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtsvg
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
 
   # Workaround qmake looking for lrelease in wrong package
   # Issue: https://github.com/NixOS/nixpkgs/issues/214765
   qmakeFlags = [
-    "QT_TOOL.lrelease.binary=${lib.getDev qttools}/bin/lrelease"
+    "QT_TOOL.lrelease.binary=${lib.getDev qt6.qttools}/bin/lrelease"
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02866760494f..758b5f2d0c4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3104,10 +3104,6 @@ with pkgs;
 
   remarshal = with python3Packages; toPythonApplication remarshal;
 
-  riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {
-    provider = "riseup";
-  };
-
   rtaudio = rtaudio_5;
 
   mpi = openmpi; # this attribute should used to build MPI applications

From e5c916e9b769473ed6c5e1aae983d21a91efbc49 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 11 Apr 2026 15:25:03 -0500
Subject: [PATCH 2/2] calyx-vpn: migrate to by-name

---
 pkgs/by-name/ca/calyx-vpn/package.nix | 7 +++++++
 pkgs/top-level/all-packages.nix       | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ca/calyx-vpn/package.nix

diff --git a/pkgs/by-name/ca/calyx-vpn/package.nix b/pkgs/by-name/ca/calyx-vpn/package.nix
new file mode 100644
index 000000000000..579dd98a9cbe
--- /dev/null
+++ b/pkgs/by-name/ca/calyx-vpn/package.nix
@@ -0,0 +1,7 @@
+{
+  riseup-vpn,
+}:
+
+riseup-vpn.override {
+  provider = "calyx";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 758b5f2d0c4c..af2281786caf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2052,10 +2052,6 @@ with pkgs;
 
   bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
 
-  calyx-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {
-    provider = "calyx";
-  };
-
   cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
 
   clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { };