From 593f744926f3efe4c74764e6bf926bae207b8af7 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 23 Sep 2024 16:25:46 +0200
Subject: [PATCH] softether: format and move to new pkgs/by-name structure

---
 .../so/softether/package.nix}                 | 20 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 16 insertions(+), 6 deletions(-)
 rename pkgs/{servers/softether/default.nix => by-name/so/softether/package.nix} (83%)

diff --git a/pkgs/servers/softether/default.nix b/pkgs/by-name/so/softether/package.nix
similarity index 83%
rename from pkgs/servers/softether/default.nix
rename to pkgs/by-name/so/softether/package.nix
index 976521f061d9..2f7cba342808 100644
--- a/pkgs/servers/softether/default.nix
+++ b/pkgs/by-name/so/softether/package.nix
@@ -1,6 +1,13 @@
-{ lib, stdenv, fetchurl
-, openssl, readline, ncurses, zlib
-, dataDir ? "/var/lib/softether" }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  openssl,
+  readline,
+  ncurses,
+  zlib,
+  dataDir ? "/var/lib/softether",
+}:
 
 stdenv.mkDerivation rec {
   pname = "softether";
@@ -12,7 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6";
   };
 
-  buildInputs = [ openssl readline ncurses zlib ];
+  buildInputs = [
+    openssl
+    readline
+    ncurses
+    zlib
+  ];
 
   preConfigure = ''
     ./configure
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5156deb58857..58895e8ad89e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25140,8 +25140,6 @@ with pkgs;
 
   oidentd = callPackage ../servers/identd/oidentd { };
 
-  softether = callPackage ../servers/softether { };
-
   qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };
 
   rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { };