From a7f8ee0b91ccdbe46ca7f0a9f5edb88bb7a79c83 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 12 Sep 2025 09:12:00 +0200
Subject: [PATCH] bashate: move to by-name, cleanup, fix

---
 .../default.nix => by-name/ba/bashate/package.nix}   | 12 +++++-------
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 5 insertions(+), 11 deletions(-)
 rename pkgs/{development/tools/bashate/default.nix => by-name/ba/bashate/package.nix} (78%)

diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/by-name/ba/bashate/package.nix
similarity index 78%
rename from pkgs/development/tools/bashate/default.nix
rename to pkgs/by-name/ba/bashate/package.nix
index 975e34e30d63..e405b8f66799 100644
--- a/pkgs/development/tools/bashate/default.nix
+++ b/pkgs/by-name/ba/bashate/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchPypi,
   python3Packages,
+  versionCheckHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -9,8 +10,6 @@ python3Packages.buildPythonApplication rec {
   version = "2.1.1";
   pyproject = true;
 
-  disabled = python3Packages.pythonOlder "3.5";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w=";
@@ -21,7 +20,6 @@ python3Packages.buildPythonApplication rec {
   dependencies = with python3Packages; [
     babel
     pbr
-    setuptools
   ];
 
   nativeCheckInputs = with python3Packages; [
@@ -39,12 +37,12 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "bashate" ];
 
-  meta = with lib; {
+  meta = {
     description = "Style enforcement for bash programs";
     mainProgram = "bashate";
     homepage = "https://opendev.org/openstack/bashate";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
-    teams = [ teams.openstack ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
+    teams = [ lib.teams.openstack ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a90342f12eeb..aaf1618c731d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1612,10 +1612,6 @@ with pkgs;
     httpServer = true;
   };
 
-  bashate = python3Packages.callPackage ../development/tools/bashate {
-    python3Packages = python311Packages;
-  };
-
   inherit (callPackages ../tools/security/bitwarden-directory-connector { })
     bitwarden-directory-connector-cli
     bitwarden-directory-connector