Merge pull request #173670 from oxzi/platformio-6.0.1

platformio: 5.2.5 -> 6.0.1

authored by

Rick van Schijndel and committed by
GitHub
f1f54948 4ae5d09a

+18 -28
+15 -25
pkgs/development/embedded/platformio/core.nix
··· 9 9 let 10 10 python = python3.override { 11 11 packageOverrides = self: super: { 12 - semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { 13 - version = "2.9.0"; 14 - src = fetchPypi { 15 - pname = "semantic_version"; 16 - version = version; 17 - sha256 = "1chjd8019wnwb5mnd4x4jw9f8nhzg0xnapsdznk0fpiyamrlixdb"; 18 - }; 19 - }); 20 - 21 12 starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { 22 - version = "0.18.0"; 13 + version = "0.20.0"; 23 14 src = fetchFromGitHub { 24 15 owner = "encode"; 25 16 repo = "starlette"; 26 17 rev = version; 27 - sha256 = "1dpj33cggjjvpd3qdf6hv04z5ckcn9f5dfn98p5a8hx262kgsr9p"; 28 - }; 29 - }); 30 - 31 - uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { 32 - version = "0.17.0"; 33 - src = fetchFromGitHub { 34 - owner = "encode"; 35 - repo = "uvicorn"; 36 - rev = version; 37 - sha256 = "142x8skb1yfys6gndfaay2r240j56dkr006p49pw4y9i0v85kynp"; 18 + sha256 = "sha256-bSgPjKqM262PSufz1LHwrdM+uU8xO55Mifv66HRN02Y="; 38 19 }; 39 20 }); 40 21 }; ··· 75 56 ]; 76 57 77 58 pytestFlagsArray = (map (e: "--deselect tests/${e}") [ 59 + "commands/pkg/test_exec.py::test_pkg_specified" 60 + "commands/pkg/test_exec.py::test_unrecognized_options" 78 61 "commands/test_ci.py::test_ci_boards" 79 62 "commands/test_ci.py::test_ci_build_dir" 80 63 "commands/test_ci.py::test_ci_keep_build_dir" ··· 84 67 "commands/test_init.py::test_init_duplicated_boards" 85 68 "commands/test_init.py::test_init_enable_auto_uploading" 86 69 "commands/test_init.py::test_init_ide_atom" 70 + "commands/test_init.py::test_init_ide_clion" 87 71 "commands/test_init.py::test_init_ide_eclipse" 88 72 "commands/test_init.py::test_init_ide_vscode" 89 73 "commands/test_init.py::test_init_incorrect_board" ··· 112 96 "commands/test_lib_complex.py::test_lib_show" 113 97 "commands/test_lib_complex.py::test_lib_stats" 114 98 "commands/test_lib_complex.py::test_search" 115 - "commands/test_test.py::test_local_env" 116 - "commands/test_test.py::test_multiple_env_build" 117 - "commands/test_test.py::test_setup_teardown_are_compilable" 118 99 "package/test_manager.py::test_download" 119 100 "package/test_manager.py::test_install_force" 120 101 "package/test_manager.py::test_install_from_registry" ··· 132 113 "test_misc.py::test_platformio_cli" 133 114 "test_pkgmanifest.py::test_packages" 134 115 ]) ++ (map (e: "--ignore=tests/${e}") [ 116 + "commands/pkg/test_install.py" 117 + "commands/pkg/test_list.py" 118 + "commands/pkg/test_outdated.py" 119 + "commands/pkg/test_search.py" 120 + "commands/pkg/test_show.py" 121 + "commands/pkg/test_uninstall.py" 122 + "commands/pkg/test_update.py" 135 123 "commands/test_boards.py" 136 124 "commands/test_check.py" 137 125 "commands/test_platform.py" 126 + "commands/test_run.py" 127 + "commands/test_test.py" 138 128 "commands/test_update.py" 139 - "test_maintenance.py" 140 129 "test_ino2cpp.py" 130 + "test_maintenance.py" 141 131 ]) ++ [ 142 132 "tests" 143 133 ];
+2 -2
pkgs/development/embedded/platformio/default.nix
··· 4 4 let 5 5 callPackage = newScope self; 6 6 7 - version = "5.2.5"; 7 + version = "6.0.1"; 8 8 9 9 # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 10 10 src = fetchFromGitHub { 11 11 owner = "platformio"; 12 12 repo = "platformio-core"; 13 13 rev = "v${version}"; 14 - sha256 = "1x1jqprwzpb09ca953rqbh2jvizh7bz8yj30krphb6007bnjilwy"; 14 + sha256 = "sha256-noLdQctAaMNmfuxI3iybHFx3Q9aTr3gZaUZ+/uO+fnA="; 15 15 }; 16 16 17 17 self = {
+1 -1
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
··· 6 6 @staticmethod 7 7 @memoized(expire="1h") 8 8 def load_spdx_licenses(): 9 - - version = "3.16" 9 + - version = "3.17" 10 10 - spdx_data_url = ( 11 11 - "https://raw.githubusercontent.com/spdx/license-list-data/" 12 12 - "v%s/json/licenses.json" % version