From c742cdf8335c63133e225439ca6704be19971c71 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 14 Dec 2024 22:19:51 +0100
Subject: [PATCH 1/3] python3Packages.compiledb: move to pkgs/by-name

a
---
 .../co/compiledb/package.nix}                       | 13 +++++--------
 pkgs/top-level/python-packages.nix                  |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{development/python-modules/compiledb/default.nix => by-name/co/compiledb/package.nix} (85%)

diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/by-name/co/compiledb/package.nix
similarity index 85%
rename from pkgs/development/python-modules/compiledb/default.nix
rename to pkgs/by-name/co/compiledb/package.nix
index 984365481285..469a99baed76 100644
--- a/pkgs/development/python-modules/compiledb/default.nix
+++ b/pkgs/by-name/co/compiledb/package.nix
@@ -1,16 +1,12 @@
 {
   lib,
-  buildPythonPackage,
   fetchFromGitHub,
-  pytest,
-  bashlex,
-  click,
-  shutilwhich,
   gcc,
   coreutils,
+  python3Packages,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "compiledb";
   version = "0.10.1";
   format = "setuptools";
@@ -29,11 +25,12 @@ buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
-    pytest
+    python3Packages.pytest
     gcc
     coreutils
   ];
-  propagatedBuildInputs = [
+
+  propagatedBuildInputs = with python3Packages; [
     click
     bashlex
     shutilwhich
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb471da1ef51..b2f5f34b7b9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2548,8 +2548,6 @@ self: super: with self; {
 
   commonmark = callPackage ../development/python-modules/commonmark { };
 
-  compiledb = callPackage ../development/python-modules/compiledb { };
-
   complycube = callPackage ../development/python-modules/complycube { };
 
   compreffor = callPackage ../development/python-modules/compreffor { };

From 8578e5155e255e3cc973c3408ca72427bb3dda59 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 14 Dec 2024 22:20:25 +0100
Subject: [PATCH 2/3] compiledb: modernize, add sigmanificient to maintainers

---
 pkgs/by-name/co/compiledb/package.nix | 44 +++++++++++++--------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/co/compiledb/package.nix b/pkgs/by-name/co/compiledb/package.nix
index 469a99baed76..e5317f48bd97 100644
--- a/pkgs/by-name/co/compiledb/package.nix
+++ b/pkgs/by-name/co/compiledb/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  gcc,
   coreutils,
   python3Packages,
 }:
@@ -9,42 +8,41 @@
 python3Packages.buildPythonApplication rec {
   pname = "compiledb";
   version = "0.10.1";
-  format = "setuptools";
+  pyproject = true;
+
+  build-system = [ python3Packages.setuptools ];
 
   src = fetchFromGitHub {
     owner = "nickdiego";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0qricdgqzry7j3rmgwyd43av3c2kxpzkh6f9zcqbzrjkn78qbpd4";
+    repo = "compiledb";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-pN2F0bFT5r8w+8kZOP/tU7Cx1SDN81fzkMfnj19jMWM=";
   };
 
-  # fix the tests
-  patchPhase = ''
-    substituteInPlace tests/data/multiple_commands_oneline.txt \
-                      --replace /bin/echo ${coreutils}/bin/echo
-  '';
-
-  nativeCheckInputs = [
-    python3Packages.pytest
-    gcc
-    coreutils
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     click
     bashlex
     shutilwhich
   ];
 
-  checkPhase = ''
-    pytest
+  # fix the tests
+  patchPhase = ''
+    substituteInPlace tests/data/multiple_commands_oneline.txt \
+        --replace-fail "/bin/echo" "${coreutils}/bin/echo"
   '';
 
-  meta = with lib; {
+  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
+
+  doCheck = true;
+
+  meta = {
     description = "Tool for generating Clang's JSON Compilation Database files";
     mainProgram = "compiledb";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     homepage = "https://github.com/nickdiego/compiledb";
-    maintainers = with maintainers; [ multun ];
+    maintainers = with lib.maintainers; [
+      sigmanificient
+      multun
+    ];
   };
 }

From 100a5e4fe8266323a4ec67211ef1e921692f65af Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 15 Dec 2024 13:13:15 +0100
Subject: [PATCH 3/3] compiledb: remove multun from maintainers following their
 request

---
 pkgs/by-name/co/compiledb/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/compiledb/package.nix b/pkgs/by-name/co/compiledb/package.nix
index e5317f48bd97..87d07c05852f 100644
--- a/pkgs/by-name/co/compiledb/package.nix
+++ b/pkgs/by-name/co/compiledb/package.nix
@@ -40,9 +40,6 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "compiledb";
     license = lib.licenses.gpl3Plus;
     homepage = "https://github.com/nickdiego/compiledb";
-    maintainers = with lib.maintainers; [
-      sigmanificient
-      multun
-    ];
+    maintainers = with lib.maintainers; [ sigmanificient ];
   };
 }