diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/by-name/bi/bikeshed/package.nix similarity index 74% rename from pkgs/applications/misc/bikeshed/default.nix rename to pkgs/by-name/bi/bikeshed/package.nix index f73b02f01968..41e9b1ffaaa6 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/by-name/bi/bikeshed/package.nix @@ -1,43 +1,10 @@ { lib, - buildPythonApplication, fetchPypi, - # build inputs - about-time, - aiofiles, - aiohttp, - aiosignal, - alive-progress, - async-timeout, - attrs, - cddlparser, - certifi, - charset-normalizer, - cssselect, - frozenlist, - html5lib, - idna, - isodate, - json-home-client, - kdl-py, - lxml, - multidict, - pillow, - pygments, - requests, - result, - setuptools, - six, - tenacity, - typing-extensions, - uri-template, - urllib3, - webencodings, - widlparser, - yarl, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bikeshed"; version = "5.2.0"; pyproject = true; @@ -47,11 +14,11 @@ buildPythonApplication rec { hash = "sha256-HUPkLEpwLRnrffUMN62WPqsZX2UsGqPfjEa91UMbUMM="; }; - build-system = [ setuptools ]; + build-system = [ python3Packages.setuptools ]; pythonRelaxDeps = true; - dependencies = [ + dependencies = with python3Packages; [ about-time aiofiles aiohttp diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fbc1a8168cc..4387981b435d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1060,8 +1060,6 @@ with pkgs; auditwheel = with python3Packages; toPythonApplication auditwheel; - bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; - davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix { studioVariant = true; };