Robert Schütz 2025-01-05 05:01:08 -08:00
parent 6df24922a1
commit db0be3a558
2 changed files with 30 additions and 14 deletions

View File

@ -17,14 +17,27 @@ let
# We keep the override around even when the versions match, as # We keep the override around even when the versions match, as
# it's likely to become relevant again after the next Poetry update. # it's likely to become relevant again after the next Poetry update.
poetry-core = super.poetry-core.overridePythonAttrs (old: rec { poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
version = "1.9.1"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "python-poetry"; owner = "python-poetry";
repo = "poetry-core"; repo = "poetry-core";
rev = "refs/tags/${version}"; tag = version;
hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8="; hash = "sha256-3dmvFn2rxtR0SK8oiEHIVJhpJpX4Mm/6kZnIYNSDv90=";
}; };
patches = [ ]; patches = [ ];
nativeCheckInputs =
old.nativeCheckInputs
++ (with self; [
trove-classifiers
]);
disabledTests = old.disabledTests ++ [
# relies on git
"test_package_with_include"
# Nix changes timestamp
"test_dist_info_date_time_default_value"
"test_sdist_members_mtime_default"
"test_sdist_mtime_zero"
];
}); });
} }
// (plugins self); // (plugins self);

View File

@ -4,21 +4,19 @@
buildPythonPackage, buildPythonPackage,
pythonOlder, pythonOlder,
fetchFromGitHub, fetchFromGitHub,
fetchpatch2,
installShellFiles, installShellFiles,
build, build,
cachecontrol, cachecontrol,
cleo, cleo,
crashtest,
dulwich, dulwich,
fastjsonschema, fastjsonschema,
installer, installer,
keyring, keyring,
packaging, packaging,
pexpect,
pkginfo, pkginfo,
platformdirs, platformdirs,
poetry-core, poetry-core,
poetry-plugin-export,
pyproject-hooks, pyproject-hooks,
requests, requests,
requests-toolbelt, requests-toolbelt,
@ -39,18 +37,26 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "poetry"; pname = "poetry";
version = "1.8.5"; version = "2.0.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "python-poetry"; owner = "python-poetry";
repo = "poetry"; repo = "poetry";
rev = "refs/tags/${version}"; tag = version;
hash = "sha256-YR0IgDhmpbe8TyTMP1cjUxGRnrfV8CNHkPlZrNcnof0="; hash = "sha256-r4TK4CKDfCeCW+Y1vUoS4ppXmn5xEvI1ZBVUHqFJLKo=";
}; };
patches = [
# https://github.com/python-poetry/poetry/pull/9939
(fetchpatch2 {
url = "https://github.com/python-poetry/poetry/commit/89c0d02761229a8aa7ac5afcbc8935387bde4c5b.patch?full_index=1";
hash = "sha256-YuAevkmCSTGuFPfuKrJfcLUye1YGpnHSb9TFSW7F1SU=";
})
];
build-system = [ build-system = [
poetry-core poetry-core
]; ];
@ -70,17 +76,14 @@ buildPythonPackage rec {
build build
cachecontrol cachecontrol
cleo cleo
crashtest
dulwich dulwich
fastjsonschema fastjsonschema
installer installer
keyring keyring
packaging packaging
pexpect
pkginfo pkginfo
platformdirs platformdirs
poetry-core poetry-core
poetry-plugin-export
pyproject-hooks pyproject-hooks
requests requests
requests-toolbelt requests-toolbelt
@ -136,8 +139,8 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
"test_builder_should_execute_build_scripts" "test_builder_should_execute_build_scripts"
"test_env_system_packages_are_relative_to_lib" "test_env_system_packages_are_relative_to_lib"
"test_executor_known_hashes"
"test_install_warning_corrupt_root" "test_install_warning_corrupt_root"
"test_project_plugins_are_installed_in_project_folder"
]; ];
pytestFlagsArray = [ pytestFlagsArray = [