DisnixWebService: rename to disnix-web-service

NixOS · Oct 1, 2024 · 6cd2f36 · 6cd2f36
1 parent 06cf0e1
commit 6cd2f36
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
@@ -42,7 +42,7 @@ in
   config = lib.mkIf cfg.enable {
     dysnomia.enable = true;
 
-    environment.systemPackages = [ pkgs.disnix ] ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    environment.systemPackages = [ pkgs.disnix ] ++ 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);
     environment.variables.DISNIX_REMOTE_CLIENT = lib.optionalString (cfg.enableMultiUser) "disnix-client";
 
@@ -52,9 +52,9 @@ in
     services.tomcat.enable = cfg.useWebServiceInterface;
     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"
+    services.tomcat.sharedLibs = 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/...ement/disnix/DisnixWebService/default.nix → ...by-name/di/disnix-web-service/package.nix b/...ement/disnix/DisnixWebService/default.nix → ...by-name/di/disnix-web-service/package.nix
@@ -1,7 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, ant, jdk, xmlstarlet, axis2, dbus_java }:
-
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  ant,
+  jdk8,
+  xmlstarlet,
+  axis2,
+  dbus_java,
+}:
+let
+  jdk = jdk8;
+in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "DisnixWebService";
+  pname = "disnix-web-service";
   version = "0.10.1";
 
   src = fetchFromGitHub {

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -342,6 +342,7 @@ mapAliases {
   dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
   dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
+  DisnixWebService = disnix-web-service; # Added 2024-06-12
   dnnl = oneDNN; # Added 2020-04-22
   dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
   docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -37992,10 +37992,6 @@ with pkgs;
 
   disnixos = callPackage ../tools/package-management/disnix/disnixos { };
 
-  DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService {
-    jdk = jdk8;
-  };
-
   i3a = callPackage ../misc/i3a { };
 
   lice = python3Packages.callPackage ../tools/misc/lice { };