From c3c09acbaa38eb61d236045f914809d0c41745a0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 26 May 2025 16:21:00 +0200 Subject: [PATCH 1/4] labelImg: add missing `distutils` runtime dependency --- pkgs/by-name/la/labelImg/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix index b61092095590..739ee325fd95 100644 --- a/pkgs/by-name/la/labelImg/package.nix +++ b/pkgs/by-name/la/labelImg/package.nix @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { }) ]; propagatedBuildInputs = with python3Packages; [ + distutils pyqt5 lxml ]; From 9d4bcc0e9c4ea51b9a670631d3f5ce0eb91991b7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 26 May 2025 16:26:16 +0200 Subject: [PATCH 2/4] labelImg: update repository URL --- pkgs/by-name/la/labelImg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix index 739ee325fd95..ab931c835c15 100644 --- a/pkgs/by-name/la/labelImg/package.nix +++ b/pkgs/by-name/la/labelImg/package.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "labelImg"; version = "1.8.6"; src = fetchFromGitHub { - owner = "tzutalin"; + owner = "HumanSignal"; repo = "labelImg"; rev = "v${version}"; hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; @@ -44,9 +44,9 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Graphical image annotation tool and label object bounding boxes in images"; mainProgram = "labelImg"; - homepage = "https://github.com/tzutalin/labelImg"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.cmcdragonkai ]; + homepage = "https://github.com/HumanSignal/labelImg"; }; } From acdc56953883a3e806e5f6c45b8b1c968a0eb5e9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 26 May 2025 16:26:42 +0200 Subject: [PATCH 3/4] labelImg: use `src.tag` --- pkgs/by-name/la/labelImg/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix index ab931c835c15..280bb02d1b75 100644 --- a/pkgs/by-name/la/labelImg/package.nix +++ b/pkgs/by-name/la/labelImg/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "HumanSignal"; repo = "labelImg"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; }; nativeBuildInputs = with python3Packages; [ From 5bc0591cec19c440ce3a4c66479ce0b75e4d561b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 26 May 2025 16:26:56 +0200 Subject: [PATCH 4/4] labelImg: cleanup --- pkgs/by-name/la/labelImg/package.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/la/labelImg/package.nix b/pkgs/by-name/la/labelImg/package.nix index 280bb02d1b75..9a6b6d033be0 100644 --- a/pkgs/by-name/la/labelImg/package.nix +++ b/pkgs/by-name/la/labelImg/package.nix @@ -8,16 +8,19 @@ python3Packages.buildPythonApplication rec { pname = "labelImg"; version = "1.8.6"; + src = fetchFromGitHub { owner = "HumanSignal"; repo = "labelImg"; tag = "v${version}"; hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; }; + nativeBuildInputs = with python3Packages; [ pyqt5 qt5.wrapQtAppsHook ]; + patches = [ # fixes https://github.com/heartexlabs/labelImg/issues/838 # can be removed after next upstream version bump @@ -26,27 +29,33 @@ python3Packages.buildPythonApplication rec { hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; }) ]; - propagatedBuildInputs = with python3Packages; [ + + dependencies = with python3Packages; [ distutils pyqt5 lxml ]; + preBuild = '' make qt5py3 ''; + postInstall = '' - cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs + install -Dm644 libs/resources.py $out/${python3Packages.python.sitePackages}/libs ''; + dontWrapQtApps = true; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with lib; { + + meta = { description = "Graphical image annotation tool and label object bounding boxes in images"; mainProgram = "labelImg"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.cmcdragonkai ]; homepage = "https://github.com/HumanSignal/labelImg"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.cmcdragonkai ]; }; }