diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/by-name/ac/acd-cli/package.nix similarity index 64% rename from pkgs/applications/networking/sync/acd_cli/default.nix rename to pkgs/by-name/ac/acd-cli/package.nix index 4124fe379d1c..54f2e51368ad 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/by-name/ac/acd-cli/package.nix @@ -1,20 +1,12 @@ { lib, fetchFromGitHub, - buildPythonApplication, fuse, - appdirs, - colorama, - python-dateutil, - requests, - requests-toolbelt, - fusepy, - sqlalchemy, - setuptools, + python3Packages, }: -buildPythonApplication rec { - pname = "acd_cli"; +python3Packages.buildPythonApplication rec { + pname = "acd-cli"; version = "0.3.2"; format = "setuptools"; @@ -22,12 +14,12 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "yadayada"; - repo = pname; - rev = version; - sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; + repo = "acd_cli"; + tag = version; + hash = "sha256-132CW5EcsgDZOeauBpNyXoFS2Q5rKPqqHIoIKobJDig="; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ appdirs colorama python-dateutil @@ -50,10 +42,10 @@ buildPythonApplication rec { lnOverBin acd_cli.py acdcli ''; - meta = with lib; { + meta = { description = "Command line interface and FUSE filesystem for Amazon Cloud Drive"; homepage = "https://github.com/yadayada/acd_cli"; - license = licenses.gpl2; - maintainers = with maintainers; [ edwtjo ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4240be550073..5b50182f0430 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11626,20 +11626,6 @@ with pkgs; patches = config."2bwm".patches or [ ]; }; - acd-cli = callPackage ../applications/networking/sync/acd_cli { - inherit (python3Packages) - buildPythonApplication - appdirs - colorama - python-dateutil - requests - requests-toolbelt - setuptools - sqlalchemy - fusepy - ; - }; - inherit (qt6Packages.callPackage ../applications/office/activitywatch { }) aw-qt aw-notify