From 252b66e1875476f6ce3eea413511f435f87a5abb Mon Sep 17 00:00:00 2001
From: tljuniper <48209000+tljuniper@users.noreply.github.com>
Date: Mon, 5 Aug 2024 09:40:46 +0200
Subject: [PATCH 1/2] bmap-tools: Replace with bmaptool

bmap-tools (https://github.com/intel/bmap-tools) has been archived in
April 2024 and marked as moved to yoctoproject/bmaptool
(https://github.com/yoctoproject/bmaptool).

This renames the file (while migrating to all-packages) and adds an alias.
---
 .../default.nix => by-name/bm/bmaptool/package.nix}    | 10 +++++-----
 pkgs/top-level/aliases.nix                             |  1 +
 pkgs/top-level/all-packages.nix                        |  2 --
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{tools/misc/bmap-tools/default.nix => by-name/bm/bmaptool/package.nix} (75%)

diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/by-name/bm/bmaptool/package.nix
similarity index 75%
rename from pkgs/tools/misc/bmap-tools/default.nix
rename to pkgs/by-name/bm/bmaptool/package.nix
index 2f36c452fcb1..2413baa37e80 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/pkgs/by-name/bm/bmaptool/package.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  pname = "bmap-tools";
+  pname = "bmaptool";
   version = "3.6";
 
   src = fetchFromGitHub {
-    owner = "intel";
-    repo = "bmap-tools";
+    owner = "yoctoproject";
+    repo = "bmaptool";
     rev = "v${version}";
     sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl";
   };
@@ -17,8 +17,8 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "bmap-related tools";
-    homepage = "https://github.com/intel/bmap-tools";
+    description = "BMAP Tools";
+    homepage = "https://github.com/yoctoproject/bmaptool";
     license = licenses.gpl2Only;
     maintainers = [ maintainers.dezgeg ];
     platforms = platforms.linux;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4382e04395fe..719ed27be2d8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -170,6 +170,7 @@ mapAliases ({
       (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
   blockbench-electron = blockbench; # Added 2024-03-16
   bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10
+  bmap-tools = bmaptool; # Added 2024-08-05
   bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01
   boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08
   boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d08ebeca01e..6b1c3fc7b9aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3452,8 +3452,6 @@ with pkgs;
 
   blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
 
-  bmap-tools = callPackage ../tools/misc/bmap-tools { };
-
   bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { };
 
   bonnmotion = callPackage ../development/tools/misc/bonnmotion { };

From afd564a3e65554591d47456c3bd064421a2f8389 Mon Sep 17 00:00:00 2001
From: tljuniper <48209000+tljuniper@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:59:37 +0200
Subject: [PATCH 2/2] bmaptool: 3.6 -> 3.8.0

---
 pkgs/by-name/bm/bmaptool/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bm/bmaptool/package.nix b/pkgs/by-name/bm/bmaptool/package.nix
index 2413baa37e80..163aca8edb3b 100644
--- a/pkgs/by-name/bm/bmaptool/package.nix
+++ b/pkgs/by-name/bm/bmaptool/package.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bmaptool";
-  version = "3.6";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "yoctoproject";
     repo = "bmaptool";
     rev = "v${version}";
-    sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl";
+    sha256 = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I=";
   };
 
   propagatedBuildInputs = with python3Packages; [ six ];