diff --git a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix b/pkgs/by-name/gi/git-annex-remote-dbx/package.nix similarity index 50% rename from pkgs/applications/version-management/git-annex-remote-dbx/default.nix rename to pkgs/by-name/gi/git-annex-remote-dbx/package.nix index 7744598f1566..60870c18602a 100644 --- a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix +++ b/pkgs/by-name/gi/git-annex-remote-dbx/package.nix @@ -1,23 +1,24 @@ { lib, - buildPythonApplication, - fetchPypi, - dropbox, - annexremote, - humanfriendly, + python3Packages, + fetchFromGitHub, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "git-annex-remote-dbx"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "5b6f8025ed1e9877f06882ddbd81f701a8e094647ab97595e2afc09016835a7c"; + src = fetchFromGitHub { + owner = "montag451"; + repo = "git-annex-remote-dbx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-a1mCLFd9fykzX3BxQBsOe6oPUzQjAzyfxExFlXCOAvQ="; }; - propagatedBuildInputs = [ + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ dropbox annexremote humanfriendly @@ -30,4 +31,4 @@ buildPythonApplication rec { mainProgram = "git-annex-remote-dbx"; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f2b40617728..73b6d628049a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1191,15 +1191,6 @@ with pkgs; github-cli = gh; - git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx { - inherit (python3Packages) - buildPythonApplication - dropbox - annexremote - humanfriendly - ; - }; - git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; git-credential-aol = callPackage ../by-name/gi/git-credential-email/git-credential-aol { };