From 98f0fb13adaaca42450b30e0c0ac1cdf3669c16b Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:19:46 +0200 Subject: [PATCH 1/2] python311Packages.pytest-spec: fix version name --- pkgs/development/python-modules/pytest-spec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix index 4a73084bd452..78dee5b25c75 100644 --- a/pkgs/development/python-modules/pytest-spec/default.nix +++ b/pkgs/development/python-modules/pytest-spec/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-spec"; - version = "unstable-2023-06-04"; + version = "3.2.0-unstable-2023-06-04"; pyproject = true; src = fetchFromGitHub { From b851b1c68fd1de2f4daeff0b8bd7d2f23932872b Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:21:27 +0200 Subject: [PATCH 2/2] python311Packages.pytest-spec: format, remove unused, use new names --- .../python-modules/pytest-spec/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix index 78dee5b25c75..2a90d45a6ea1 100644 --- a/pkgs/development/python-modules/pytest-spec/default.nix +++ b/pkgs/development/python-modules/pytest-spec/default.nix @@ -1,14 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytest -, pytestCheckHook -, pytest-describe -, pytest-cov +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytest, + pytestCheckHook, + pytest-describe, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-spec"; version = "3.2.0-unstable-2023-06-04"; pyproject = true; @@ -24,8 +24,8 @@ buildPythonPackage rec { sed -i '/addopts/d' setup.cfg # TODO: upstream substituteInPlace pyproject.toml \ - --replace "poetry>=0.12" "poetry-core" \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" + --replace-fail "poetry>=0.12" "poetry-core" \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" ''; nativeBuildInputs = [ poetry-core ];