From 1aa08524d6282b64ffcef7e1aaa9b15aac748cb7 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 17:54:14 -0700
Subject: [PATCH] openconnect{,_openssl}: migrate to by-name

---
 .../op/openconnect/package.nix}               | 15 ++++++++-----
 .../op/openconnect_openssl/package.nix        |  7 ++++++
 pkgs/tools/networking/openconnect/default.nix | 22 -------------------
 pkgs/top-level/all-packages.nix               |  6 ++---
 4 files changed, 19 insertions(+), 31 deletions(-)
 rename pkgs/{tools/networking/openconnect/common.nix => by-name/op/openconnect/package.nix} (82%)
 create mode 100644 pkgs/by-name/op/openconnect_openssl/package.nix
 delete mode 100644 pkgs/tools/networking/openconnect/default.nix

diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/by-name/op/openconnect/package.nix
similarity index 82%
rename from pkgs/tools/networking/openconnect/common.nix
rename to pkgs/by-name/op/openconnect/package.nix
index b9ff4d68382e..ff4056cfc531 100644
--- a/pkgs/tools/networking/openconnect/common.nix
+++ b/pkgs/by-name/op/openconnect/package.nix
@@ -1,11 +1,7 @@
-{
-  version,
-  src,
-}:
-
 {
   lib,
   stdenv,
+  fetchFromGitLab,
   pkg-config,
   gnutls,
   p11-kit,
@@ -25,7 +21,14 @@
 
 stdenv.mkDerivation {
   pname = "openconnect";
-  inherit version src;
+  version = "9.12-unstable-2025-11-03";
+
+  src = fetchFromGitLab {
+    owner = "openconnect";
+    repo = "openconnect";
+    rev = "0dcdff87db65daf692dc323732831391d595d98d";
+    hash = "sha256-AvowUEDkXvR+QkhJbZU759fZjIqj/mO8HjP2Ka3lH1U=";
+  };
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/op/openconnect_openssl/package.nix b/pkgs/by-name/op/openconnect_openssl/package.nix
new file mode 100644
index 000000000000..42b85ff0fb1c
--- /dev/null
+++ b/pkgs/by-name/op/openconnect_openssl/package.nix
@@ -0,0 +1,7 @@
+{
+  openconnect,
+}:
+
+openconnect.override {
+  useOpenSSL = true;
+}
diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
deleted file mode 100644
index 80409477f9bf..000000000000
--- a/pkgs/tools/networking/openconnect/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  callPackage,
-  fetchFromGitLab,
-}:
-let
-  common = opts: callPackage (import ./common.nix opts) { };
-in
-rec {
-  openconnect = common {
-    version = "9.12-unstable-2025-11-03";
-    src = fetchFromGitLab {
-      owner = "openconnect";
-      repo = "openconnect";
-      rev = "0dcdff87db65daf692dc323732831391d595d98d";
-      hash = "sha256-AvowUEDkXvR+QkhJbZU759fZjIqj/mO8HjP2Ka3lH1U=";
-    };
-  };
-
-  openconnect_openssl = openconnect.override {
-    useOpenSSL = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1698fcfed5a..56834e3bd07d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3114,9 +3114,9 @@ with pkgs;
   voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; };
   voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; };
 
-  openconnectPackages = callPackage ../tools/networking/openconnect { };
-
-  inherit (openconnectPackages) openconnect openconnect_openssl;
+  openconnectPackages = {
+    inherit openconnect openconnect_openssl;
+  };
 
   buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };