diff --git a/pkgs/tools/misc/pricehist/default.nix b/pkgs/by-name/pr/pricehist/package.nix similarity index 63% rename from pkgs/tools/misc/pricehist/default.nix rename to pkgs/by-name/pr/pricehist/package.nix index cf5eb82a00ec..16a5c29fc227 100644 --- a/pkgs/tools/misc/pricehist/default.nix +++ b/pkgs/by-name/pr/pricehist/package.nix @@ -1,18 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitLab, - requests, - lxml, - cssselect, - curlify, - poetry-core, - pytest-mock, - responses, - pytestCheckHook, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pricehist"; version = "1.4.7"; format = "pyproject"; @@ -20,32 +12,32 @@ buildPythonApplication rec { src = fetchFromGitLab { owner = "chrisberkhout"; repo = "pricehist"; - rev = version; + tag = version; hash = "sha256-SBRJxNnA+nOxO6h97WZZHwhxoXeNtb5+rDayn4Hw6so="; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ requests lxml cssselect curlify + ]; + + build-system = with python3Packages; [ poetry-core ]; - nativeBuildInputs = [ - ]; - - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ responses pytest-mock pytestCheckHook ]; - meta = with lib; { + meta = { description = "Command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats"; homepage = "https://gitlab.com/chrisberkhout/pricehist"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "pricehist"; - maintainers = with maintainers; [ chrpinedo ]; + maintainers = with lib.maintainers; [ chrpinedo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d36eed6cbe6a..045891de15b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1123,8 +1123,6 @@ with pkgs; withUsdView = true; }; - pricehist = python3Packages.callPackage ../tools/misc/pricehist { }; - py7zr = with python3Packages; toPythonApplication py7zr; qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };