From 58e29b3bd32c8c25885197b9c3f03653e305d614 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 3 Oct 2024 12:27:27 +0000
Subject: [PATCH 1/2] bundletool: modernized derivation and formatted via
 nixfmt-rfc-style

- Removed rec
- Removed with lib;
- Formatted via nixfmt-rfc-style
- Added @momeemt to maintainers

Co-authored-by: OTABI Tomoya <tomoya.otabi@gmail.com>
---
 pkgs/development/tools/bundletool/default.nix | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix
index 0a76299582270d7..da40101e552301d 100644
--- a/pkgs/development/tools/bundletool/default.nix
+++ b/pkgs/development/tools/bundletool/default.nix
@@ -1,11 +1,17 @@
-{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }:
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  makeBinaryWrapper,
+  jre_headless,
+}:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bundletool";
   version = "1.17.1";
 
   src = fetchurl {
-    url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
+    url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
     sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI=";
   };
 
@@ -19,14 +25,14 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to manipulate Android App Bundles";
     mainProgram = "bundletool";
     homepage = "https://developer.android.com/studio/command-line/bundletool";
-    changelog = "https://github.com/google/bundletool/releases/tag/${version}";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    maintainers = [ ];
+    changelog = "https://github.com/google/bundletool/releases/tag/${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = with lib.maintainers; [ momeemt ];
     platforms = jre_headless.meta.platforms;
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
-}
+})

From 1eec2d3b0c429714eb05ad847a5fd60576fc6eb5 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 3 Oct 2024 12:28:16 +0000
Subject: [PATCH 2/2] bundletool: moved to by-name

---
 .../default.nix => by-name/bu/bundletool/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/bundletool/default.nix => by-name/bu/bundletool/package.nix} (100%)

diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/by-name/bu/bundletool/package.nix
similarity index 100%
rename from pkgs/development/tools/bundletool/default.nix
rename to pkgs/by-name/bu/bundletool/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20802383bd4c3f6..5d9c392c297f964 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4217,8 +4217,6 @@ with pkgs;
 
   buildtorrent = callPackage ../tools/misc/buildtorrent { };
 
-  bundletool = callPackage ../development/tools/bundletool { };
-
   bwm_ng = callPackage ../tools/networking/bwm-ng { };
 
   bwbasic = callPackage ../development/interpreters/bwbasic { };