From 8c78777bac4d62bedb8905a6c6e527b2aebe7087 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 8 Oct 2024 22:38:23 +0200
Subject: [PATCH] python312Packages.imgtool: remove

This is already packaged as a proper Python application in
mcuboot-imgtool. An alias redirects existing users.
---
 .../python-modules/imgtool/default.nix        | 45 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/development/python-modules/imgtool/default.nix

diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix
deleted file mode 100644
index ba083666336f..000000000000
--- a/pkgs/development/python-modules/imgtool/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-  setuptools,
-  cbor2,
-  click,
-  cryptography,
-  intelhex,
-  pyyaml,
-}:
-
-buildPythonPackage rec {
-  pname = "imgtool";
-  version = "2.1.0";
-  pyproject = true;
-
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-T3+831PETqqmImUEUQzLUvfvAMmXUDz5STSzMMlge2A=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    cbor2
-    click
-    cryptography
-    intelhex
-    pyyaml
-  ];
-
-  pythonImportsCheck = [ "imgtool" ];
-
-  meta = with lib; {
-    description = "MCUboot's image signing and key management";
-    mainProgram = "imgtool";
-    homepage = "https://github.com/mcu-tools/mcuboot";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ samueltardieu ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 1898c65622b1..6ee4d6464333 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -268,6 +268,7 @@ mapAliases ({
   imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08
   image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10
   imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10
+  imgtool = throw "imgtool has been promoted to a top-level attribute name: `mcuboot-imgtool`"; # added 2024-10-09
   intreehook =  throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11
   ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30
   ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years";  # added 2024-05-21
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ec548731554..9c4ca666b447 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6039,8 +6039,6 @@ self: super: with self; {
 
   imgsize = callPackage ../development/python-modules/imgsize { };
 
-  imgtool = callPackage ../development/python-modules/imgtool { };
-
   imgw-pib = callPackage ../development/python-modules/imgw-pib { };
 
   imia = callPackage ../development/python-modules/imia { };