arvo-tools: move to by-name and modernize derivation (#343860)

2 files changed, 17 insertions, 12 deletions

diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/by-name/av/avro-tools/package.nix
index 9615d4574cdb2..730a05a259e8e 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/pkgs/by-name/av/avro-tools/package.nix
@@ -1,12 +1,19 @@
-{ stdenv, fetchurl, makeWrapper, jre, lib }:
-
-stdenv.mkDerivation rec {
+{
+  stdenv,
+  fetchurl,
+  makeWrapper,
+  jre,
+  lib,
+}:
+let
   pname = "avro-tools";
   version = "1.11.3";
+in
+stdenv.mkDerivation {
+  inherit pname version;
 
   src = fetchurl {
-    url =
-    "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
+    url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
     sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI=";
   };
 
@@ -25,12 +32,12 @@ stdenv.mkDerivation rec {
     --add-flags "-jar $out/libexec/avro-tools/${pname}.jar"
   '';
 
-  meta = with lib; {
-    homepage    = "https://avro.apache.org/";
+  meta = {
+    homepage = "https://avro.apache.org/";
     description = "Avro command-line tools and utilities";
     mainProgram = "avro-tools";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license     = lib.licenses.asl20;
-    maintainers = [ ];
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ momeemt ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef70001ce070b..30fa353b7dfa6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -307,8 +307,6 @@ with pkgs;
 
   atomic-swap = callPackage ../applications/blockchains/atomic-swap { };
 
-  avro-tools = callPackage ../development/tools/avro-tools { };
-
   bacnet-stack = callPackage ../tools/networking/bacnet-stack { };
 
   bada-bib = callPackage ../applications/science/misc/bada-bib { };