From a4382f4b412e47d304adfaf2d64e0f2517c374f8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 2 Mar 2026 08:07:24 -0600 Subject: [PATCH 1/2] git-annex-metadata-gui: migrate to by-name --- .../gi/git-annex-metadata-gui/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 4 insertions(+), 12 deletions(-) rename pkgs/{applications/version-management/git-annex-metadata-gui/default.nix => by-name/gi/git-annex-metadata-gui/package.nix} (87%) diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix similarity index 87% rename from pkgs/applications/version-management/git-annex-metadata-gui/default.nix rename to pkgs/by-name/gi/git-annex-metadata-gui/package.nix index d92ee4662222..e5ad93ce0e2c 100644 --- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix +++ b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyqt5, qt5, - git-annex-adapter, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-annex-metadata-gui"; version = "0.2.0"; format = "setuptools"; @@ -30,8 +28,8 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pyqt5 - git-annex-adapter + python3Packages.pyqt5 + python3Packages.git-annex-adapter ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7dd32a0c162..ec1ab7b3f31b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1123,12 +1123,6 @@ with pkgs; github-cli = gh; - git-annex-metadata-gui = - libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui - { - inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; - }; - git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx { inherit (python3Packages) buildPythonApplication From 9ba2d6a74bba15dadd4bb86ed5d4806c74adced1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 2 Mar 2026 08:11:01 -0600 Subject: [PATCH 2/2] git-annex-metadata-gui: modernize derivation, switch to PEP517 --- .../gi/git-annex-metadata-gui/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/git-annex-metadata-gui/package.nix b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix index e5ad93ce0e2c..084377bb1819 100644 --- a/pkgs/by-name/gi/git-annex-metadata-gui/package.nix +++ b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix @@ -5,16 +5,16 @@ qt5, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "git-annex-metadata-gui"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "alpernebbi"; repo = "git-annex-metadata-gui"; - rev = "v${version}"; - sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VU2d0ls4XOzj2jgqBISdS3FODHoGpBOQZjRhMI+BbA4="; }; prePatch = '' @@ -27,7 +27,11 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - propagatedBuildInputs = [ + build-system = [ + python3Packages.setuptools + ]; + + dependencies = [ python3Packages.pyqt5 python3Packages.git-annex-adapter ]; @@ -43,4 +47,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux; }; -} +})