From 6197bf1cf3bd7460e2856442aeabce10995baef6 Mon Sep 17 00:00:00 2001
From: Adrien Faure <adrien.faure@protonmail.com>
Date: Thu, 5 Dec 2024 21:48:37 +0100
Subject: [PATCH] organize: package version using uv

---
 flake.lock                |  6 ++---
 pkgs/organize/default.nix | 57 ++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index 91a1508..4b6fcff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -266,11 +266,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732824227,
-        "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
+        "lastModified": 1733261153,
+        "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
+        "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/organize/default.nix b/pkgs/organize/default.nix
index b45069a..1bdcb4c 100644
--- a/pkgs/organize/default.nix
+++ b/pkgs/organize/default.nix
@@ -9,30 +9,31 @@
 python3Packages.buildPythonApplication rec {
   pname = "organize";
   version = "3.2.5";
-  format = "pyproject";
-
-  # disabled = python3.pythonOlder "3.9";
-
-  # TODO:How could I handle that better ?
-  #  - Ask upstream to loosen the version
-  #  - Create a package with the deps ?
-  patchPhase = ''
-    substituteInPlace pyproject.toml --replace \
-      'pdfminer-six = "^20231228"' 'pdfminer-six = "^20240706"'
-  '';
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "tfeldmann";
+    owner = "adfaure";
     repo = "${pname}";
-    rev = "v${version}";
-    hash = "sha256-C68S1AFfiOAMuvEU2sBHIgdQkPX6ydied4Kq4ChmLP8=";
+    rev = "uv";
+    hash = "sha256-5LoQLCSi8YzlOOGxzNZBAatFR7Fshu2U4IJOrdurXSE=";
   };
 
-  # All requirements are pinned
-  pythonRelaxDeps = false;
+  build-system = [ python3.pkgs.setuptools ];
 
-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+  ];
+
+  buildInputs = with python3.pkgs; [
+    # Dev dependencies for test
+    coverage
+    mypy
+    pyfakefs
+    pytest-cov
+    pytest
+    requests
+    ruff
+    types-pyyaml
   ];
 
   propagatedBuildInputs = (with python3.pkgs; [
@@ -54,30 +55,18 @@ python3Packages.buildPythonApplication rec {
     pyyaml
     rich
     send2trash
-
   ]) ++ [
     simplematch
     ExifRead
   ];
 
-  pythonImportsCheck = [
-    "poetry.core"
-  ];
-
-  # Allow for package to use pep420's native namespaces
-  pythonNamespaces = [
-    "poetry"
-  ];
-
-  # https://codeload.github.com/tfeldmann/organize/tar.gz/refs/tags/v3.2.1
+  doCheck = true;
 
-  # Tests do not pass
-  doCheck = false;
-  meta = with lib; {
+  meta = {
     description = "";
-    homepage = https://github.com/tfeldmann;
+    homepage = "https://github.com/tfeldmann";
     platforms = python3Packages.pyinotify.meta.platforms;
-    licence = licenses.gpl2;
+    licence = lib.licenses.gpl2;
     longDescription = ''
     '';
   };