lol

Merge pull request #265544 from dotlambda/poetry-1.7.0

poetry: 1.6.1 -> 1.7.0

authored by

Robert Schütz and committed by
GitHub
57372962 feae8388

+9 -16
+2 -2
pkgs/tools/package-management/poetry/default.nix
··· 12 12 # We keep the override around even when the versions match, as 13 13 # it's likely to become relevant again after the next Poetry update. 14 14 poetry-core = super.poetry-core.overridePythonAttrs (old: rec { 15 - version = poetry.version; 15 + version = "1.8.1"; 16 16 src = fetchFromGitHub { 17 17 owner = "python-poetry"; 18 18 repo = "poetry-core"; 19 19 rev = version; 20 - hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; 20 + hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM="; 21 21 }; 22 22 }); 23 23 } // (plugins self);
+2 -2
pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
··· 6 6 7 7 buildPythonPackage rec { 8 8 pname = "poetry-plugin-export"; 9 - version = "1.5.0"; 9 + version = "1.6.0"; 10 10 format = "pyproject"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "python-poetry"; 14 14 repo = pname; 15 15 rev = "refs/tags/${version}"; 16 - hash = "sha256-bX7Mqpe7SYQQVrPNVOl8Bwmeiq7owIiUhw0sp5+Gwck="; 16 + hash = "sha256-6U96O0mCQpviBr4I67ZfHytsooXG4oCNTx8YqrrIzYo="; 17 17 }; 18 18 19 19 postPatch = ''
+5 -12
pkgs/tools/package-management/poetry/unwrapped.nix
··· 3 3 , buildPythonPackage 4 4 , pythonOlder 5 5 , fetchFromGitHub 6 - , fetchpatch 7 6 , installShellFiles 8 7 , pythonRelaxDepsHook 9 8 , build ··· 42 41 43 42 buildPythonPackage rec { 44 43 pname = "poetry"; 45 - version = "1.6.1"; 44 + version = "1.7.0"; 46 45 format = "pyproject"; 47 46 48 47 disabled = pythonOlder "3.8"; ··· 51 50 owner = "python-poetry"; 52 51 repo = pname; 53 52 rev = "refs/tags/${version}"; 54 - hash = "sha256-/OvYT4Vix1t5Yx/Tx0z3E9L9qJ4OdI4maQqUVl8H524="; 53 + hash = "sha256-au+4TOh/sA1+XZqXvWkKxfSdurusBR4l8jsPg6acUM8="; 55 54 }; 56 55 57 - patches = [ 58 - # Backport patch to fix pypa/build 1.0 incompatibility 59 - # FIXME: remove in next release 60 - (fetchpatch { 61 - url = "https://github.com/python-poetry/poetry/commit/a16863d1a448ff91a7cc4e48042d3a8669b78b34.patch"; 62 - hash = "sha256-dWa5W1jFS7h5cTgoFy89o1Rbtmyddvme4sus+lld058="; 63 - }) 64 - ]; 65 - 66 56 nativeBuildInputs = [ 67 57 installShellFiles 68 58 pythonRelaxDepsHook ··· 132 122 ''; 133 123 134 124 disabledTests = [ 125 + "test_env_system_packages_are_relative_to_lib" 126 + "test_install_warning_corrupt_root" 135 127 "test_installer_with_pypi_repository" 136 128 # touches network 137 129 "git" ··· 148 140 # fs permission errors 149 141 "test_builder_should_execute_build_scripts" 150 142 # poetry.installation.chef.ChefBuildError: Backend 'poetry.core.masonry.api' is not available. 143 + "test_isolated_env_install_success" 151 144 "test_prepare_sdist" 152 145 "test_prepare_directory" 153 146 "test_prepare_directory_with_extensions"