Unverified Commit 77ce1e7b authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

disnix-web-service: rename from DisnixWebService (#320264)

parents ee4feda7 46a43b3d

nixos/modules/services/misc/disnix.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;

pkgs/by-name/di/DisnixWebService/package.nix→pkgs/by-name/di/disnix-web-service/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -551,6 +551,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