From e4a3cac40c16be2cb6926443811ce15ce66919dd Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Mon, 23 Sep 2024 13:24:27 +0900
Subject: [PATCH 1/2] bloaty: 1.1-unstable-2023-11-06 ->
 1.1-unstable-2024-09-23 - Removed `with lib;` - Removed `rec` - Formatted via
 nixfmt-rfc-style

---
 pkgs/development/tools/bloaty/default.nix | 64 ++++++++++++++++-------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 1393a7ca54e9..fab4550cbdb0 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,16 +1,19 @@
-{ lib, stdenv, cmake, zlib, fetchFromGitHub, re2, abseil-cpp, protobuf, capstone, gtest, pkg-config, lit, llvmPackages_16 }:
-
-stdenv.mkDerivation rec {
-  pname = "bloaty";
-  version = "1.1-unstable-2023-11-06";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "bloaty";
-    rev = "16f9fe54d9cd0e9abe1d25fc1a9b44c214cfaa9f";
-    hash = "sha256-mIVlNMKtJMfH2QdYZ6+oV7619oYzvKkq3fHY6uofqlM=";
-  };
-
+{
+  lib,
+  stdenv,
+  cmake,
+  zlib,
+  fetchFromGitHub,
+  re2,
+  abseil-cpp,
+  protobuf,
+  capstone,
+  gtest,
+  pkg-config,
+  lit,
+  llvmPackages_16,
+}:
+let
   # Old vendored package which has no other use than here, so not packaged in nixpkgs.
   demumble = fetchFromGitHub {
     owner = "nico";
@@ -18,6 +21,17 @@ stdenv.mkDerivation rec {
     rev = "01098eab821b33bd31b9778aea38565cd796aa85";
     hash = "sha256-605SsXd7TSdm3BH854ChHIZbOXcHI/n8RN+pFMz4Ex4=";
   };
+in
+stdenv.mkDerivation {
+  pname = "bloaty";
+  version = "1.1-unstable-2024-09-23";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "bloaty";
+    rev = "0c89acd7e8b9d91fd1e9c8c129be627b4e47f1ea";
+    hash = "sha256-txZDPytWnkjkiVkPL2SWLwCPEtVvqoI/MVRvbJ2kBGw=";
+  };
 
   cmakeFlags = [
     "-DLIT_EXECUTABLE=${lit}/bin/lit"
@@ -39,9 +53,21 @@ stdenv.mkDerivation rec {
     rm -rf tests/wasm
   '';
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
 
-  buildInputs = [ zlib re2 abseil-cpp protobuf capstone gtest lit llvmPackages_16.libllvm ];
+  buildInputs = [
+    zlib
+    re2
+    abseil-cpp
+    protobuf
+    capstone
+    gtest
+    lit
+    llvmPackages_16.libllvm
+  ];
 
   doCheck = true;
 
@@ -54,12 +80,12 @@ stdenv.mkDerivation rec {
     install -Dm755 {.,$out/bin}/bloaty
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Size profiler for binaries";
     mainProgram = "bloaty";
     homepage = "https://github.com/google/bloaty";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ momeemt ];
   };
 }

From dc4a4b2ad0e7ad11a4a969d65ce9ced5f1fa2b03 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Mon, 23 Sep 2024 13:25:27 +0900
Subject: [PATCH 2/2] bloaty: moved to by-name

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

diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/by-name/bl/bloaty/package.nix
similarity index 100%
rename from pkgs/development/tools/bloaty/default.nix
rename to pkgs/by-name/bl/bloaty/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20802383bd4c..904d190538b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17327,8 +17327,6 @@ with pkgs;
 
   blackmagic = callPackage ../development/embedded/blackmagic { };
 
-  bloaty = callPackage ../development/tools/bloaty { };
-
   bloomrpc = callPackage ../development/web/bloomrpc { };
 
   bloop = callPackage ../development/tools/build-managers/bloop { };