From 63f137ac3faa8ac20fba1e12d855102ba94640eb Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Tue, 17 Sep 2024 21:23:58 +0200 Subject: [PATCH] axis2: migrate to pkgs/by-name, format with nixfmt-rfc-style --- .../tomcat/axis2/default.nix => by-name/ax/axis2/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{servers/http/tomcat/axis2/default.nix => by-name/ax/axis2/package.nix} (100%) diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/by-name/ax/axis2/package.nix similarity index 100% rename from pkgs/servers/http/tomcat/axis2/default.nix rename to pkgs/by-name/ax/axis2/package.nix index 771a38376fa9..adb305f3100e 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/by-name/ax/axis2/package.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, - fetchurl, ant, + fetchurl, jdk, + nixosTests, stripJavaArchivesHook, unzip, - nixosTests, }: stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29fa719a02ce..1d6ba63c43ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25554,8 +25554,6 @@ with pkgs; matomo_5 matomo-beta; - axis2 = callPackage ../servers/http/tomcat/axis2 { }; - inherit (callPackages ../servers/unifi { }) unifi7 unifi8;