diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/by-name/sw/swaytools/package.nix similarity index 57% rename from pkgs/tools/wayland/swaytools/default.nix rename to pkgs/by-name/sw/swaytools/package.nix index 3f994ef03eb2..45884093a7a2 100644 --- a/pkgs/tools/wayland/swaytools/default.nix +++ b/pkgs/by-name/sw/swaytools/package.nix @@ -1,15 +1,13 @@ { lib, - setuptools, - buildPythonApplication, + python3Packages, fetchFromGitHub, slurp, + nix-update-script, }: - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "swaytools"; version = "0.1.2"; - format = "pyproject"; src = fetchFromGitHub { @@ -19,15 +17,17 @@ buildPythonApplication rec { sha256 = "sha256-UoWK53B1DNmKwNLFwJW1ZEm9dwMOvQeO03+RoMl6M0Q="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = [ slurp ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/tmccombs/swaytools"; description = "Collection of simple tools for sway (and i3)"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ atila ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ atila ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c4d83e7819d..d4ab602b269e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2266,8 +2266,6 @@ with pkgs; wlroots = wlroots_0_18; }; - swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; - cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; cplex = callPackage ../applications/science/math/cplex (config.cplex or { });