diff options
Diffstat (limited to 'nixpkgs/pkgs/by-name/py')
-rw-r--r-- | nixpkgs/pkgs/by-name/py/pyp/package.nix | 95 | ||||
-rw-r--r-- | nixpkgs/pkgs/by-name/py/pyprland/package.nix | 4 |
2 files changed, 54 insertions, 45 deletions
diff --git a/nixpkgs/pkgs/by-name/py/pyp/package.nix b/nixpkgs/pkgs/by-name/py/pyp/package.nix index 1ba4629220db..08f3fdc63d49 100644 --- a/nixpkgs/pkgs/by-name/py/pyp/package.nix +++ b/nixpkgs/pkgs/by-name/py/pyp/package.nix @@ -1,51 +1,60 @@ { lib -, fetchFromGitHub -, python3 , bc +, fetchFromGitHub , jq +, python3 }: let - version = "1.1.0"; -in python3.pkgs.buildPythonApplication { - pname = "pyp"; - inherit version; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "hauntsaninja"; - repo = "pyp"; - rev = "v${version}"; - hash = "sha256-A1Ip41kxH17BakHEWEuymfa24eBEl5FIHAWL+iZFM4I="; - }; + pythonPackages = python3.pkgs; + finalAttrs = { + pname = "pyp"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "hauntsaninja"; + repo = "pyp"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-hnEgqWOIVj2ugOhd2aS9IulfkVnrlkhwOtrgH4qQqO8="; + }; + + pyproject = true; + + build-system = with pythonPackages; [ + flit-core + ]; + + nativeCheckInputs = (with pythonPackages; [ + pytestCheckHook + ]) ++ [ + bc + jq + ]; + + pythonImportsCheck = [ + "pyp" + ]; + + # without this, the tests fail because they are unable to find the pyp tool + # itself... + preCheck = '' + _OLD_PATH_=$PATH + PATH=$out/bin:$PATH + ''; + + # And a cleanup! + postCheck = '' + PATH=$_OLD_PATH_ + ''; - nativeBuildInputs = [ - python3.pkgs.flit-core - ]; - - nativeCheckInputs = [ - python3.pkgs.pytestCheckHook - bc - jq - ]; - - # without this, the tests fail because they are unable to find the pyp tool - # itself... - preCheck = '' - _OLD_PATH_=$PATH - PATH=$out/bin:$PATH - ''; - - # And a cleanup - postCheck = '' - PATH=$_OLD_PATH_ - ''; - - meta = { - homepage = "https://github.com/hauntsaninja/pyp"; - description = "Easily run Python at the shell"; - changelog = "https://github.com/hauntsaninja/pyp/blob/${version}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + meta = { + homepage = "https://github.com/hauntsaninja/pyp"; + description = "Easily run Python at the shell"; + changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + mainProgram = "pyp"; + maintainers = with lib.maintainers; [ rmcgibbo AndersonTorres ]; + }; }; -} +in +pythonPackages.buildPythonPackage finalAttrs diff --git a/nixpkgs/pkgs/by-name/py/pyprland/package.nix b/nixpkgs/pkgs/by-name/py/pyprland/package.nix index efb35780b89b..c7c8c9cf33b7 100644 --- a/nixpkgs/pkgs/by-name/py/pyprland/package.nix +++ b/nixpkgs/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.0.5"; + version = "2.0.9"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-VaNJ6hSdcH23Vk7JJpmNV6Qxb7gK5xWK6WHdeyfjUvQ="; + hash = "sha256-dfE4KQguLp9DEWOuCtNDw8TA3sK9vEqU4VqAVlVaUvw="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; |