From 46a43b3dc448a120d4bac6b80ce8e3b7e192916c Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 14 Jan 2026 21:07:13 +0100
Subject: [PATCH] disnix-web-service: rename from DisnixWebService

---
 nixos/modules/services/misc/disnix.nix                 |  6 +++---
 .../package.nix                                        | 10 +++++-----
 pkgs/top-level/aliases.nix                             |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename pkgs/by-name/di/{DisnixWebService => disnix-web-service}/package.nix (87%)

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 18d1023902b5..1b6eb94a5643 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -50,7 +50,7 @@ in
     environment.systemPackages = [
       pkgs.disnix
     ]
-    ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    ++ lib.optional cfg.useWebServiceInterface pkgs.disnix-web-service;
     environment.variables.PATH = lib.optionals cfg.enableProfilePath (
       map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin") cfg.profiles
     );
@@ -63,9 +63,9 @@ in
     services.tomcat.extraGroups = [ "disnix" ];
     services.tomcat.javaOpts = "${lib.optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
     services.tomcat.sharedLibs =
-      lib.optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
+      lib.optional cfg.useWebServiceInterface "${pkgs.disnix-web-service}/share/java/DisnixConnection.jar"
       ++ lib.optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
-    services.tomcat.webapps = lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    services.tomcat.webapps = lib.optional cfg.useWebServiceInterface pkgs.disnix-web-service;
 
     users.groups.disnix.gid = config.ids.gids.disnix;
 
diff --git a/pkgs/by-name/di/DisnixWebService/package.nix b/pkgs/by-name/di/disnix-web-service/package.nix
similarity index 87%
rename from pkgs/by-name/di/DisnixWebService/package.nix
rename to pkgs/by-name/di/disnix-web-service/package.nix
index 447b18f5281c..a46a2e266d25 100644
--- a/pkgs/by-name/di/DisnixWebService/package.nix
+++ b/pkgs/by-name/di/disnix-web-service/package.nix
@@ -13,7 +13,7 @@ let
   jdk = jdk8;
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "DisnixWebService";
+  pname = "disnix-web-service";
   version = "0.10.1";
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   env = {
-    PREFIX = "\${env.out}";
+    PREFIX = placeholder "out";
     AXIS2_LIB = "${axis2}/lib";
     AXIS2_WEBAPP = "${axis2}/webapps/axis2";
     DBUS_JAVA_LIB = "${dbus_java}/share/java";
@@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     # add modificationtime="0" to the <jar> and <war> tasks to achieve reproducibility
     xmlstarlet ed -L -a "//jar|//war" -t attr -n "modificationtime" -v "0" build.xml
 
-    sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
-       -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
-        scripts/disnix-soap-client
+    substituteInPlace scripts/disnix-soap-client \
+      --replace-fail "#JAVA_HOME=" ${lib.escapeShellArg "JAVA_HOME=${jdk}"} \
+      --replace-fail "#AXIS2_LIB=" "AXIS2_LIB=$AXIS2_LIB"
   '';
 
   buildPhase = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e2e2d54edcce..dec077fe4dd3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -538,6 +538,7 @@ mapAliases {
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
   discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29
+  DisnixWebService = warnAlias "'DisnixWebService' has been renamed to 'disnix-web-service'" disnix-web-service; # Added 2026-01-14
   dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
   dleyna-core = throw "'dleyna-core' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
   dleyna-renderer = throw "'dleyna-renderer' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27