Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

platformio-core: add missing dependencies and adjust path environment variable (#422153)

authored by Martin Weinelt and committed by GitHub 8db936ef 11ca73ac

Changed files
+20 -3
pkgs
development
+11
pkgs/development/embedded/platformio/builder-prioritize-python-env-in-path.patch
··· 1 + --- a/platformio/builder/main.py 2 + +++ b/platformio/builder/main.py 3 + @@ -46,6 +46,8 @@ clivars.AddVariables( 4 + ("PROGRAM_ARGS",), 5 + ) 6 + 7 + +os.environ["PATH"] = os.pathsep.join([os.path.dirname(get_pythonexe_path()), os.environ.get("PATH")]) 8 + + 9 + DEFAULT_ENV_OPTIONS = dict( 10 + tools=[ 11 + "ar",
+9 -3
pkgs/development/embedded/platformio/core.nix
··· 32 32 33 33 patches = [ 34 34 (replaceVars ./interpreter.patch { 35 - interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter; 35 + interpreter = (python3Packages.python.withPackages (_: dependencies)).interpreter; 36 36 }) 37 37 (replaceVars ./use-local-spdx-license-list.patch { 38 38 spdx_license_list_data = spdx-license-list-data.json; ··· 45 45 hash = "sha256-yq+/QHCkhAkFND11MbKFiiWT3oF1cHhgWj5JkYjwuY0="; 46 46 revert = true; 47 47 }) 48 + ./builder-prioritize-python-env-in-path.patch 48 49 ]; 49 50 50 51 postPatch = '' ··· 57 58 58 59 nativeBuildInputs = [ 59 60 installShellFiles 60 - setuptools 61 61 udevCheckHook 62 62 ]; 63 + 64 + build-system = [ setuptools ]; 63 65 64 66 pythonRelaxDeps = true; 65 67 66 - propagatedBuildInputs = [ 68 + dependencies = [ 67 69 aiofiles 68 70 ajsonrpc 69 71 bottle ··· 71 73 click-completion 72 74 colorama 73 75 git 76 + intelhex 74 77 lockfile 75 78 marshmallow 79 + pip 76 80 pyelftools 77 81 pyserial 82 + pyyaml 78 83 requests 79 84 semantic-version 80 85 setuptools ··· 82 87 starlette 83 88 tabulate 84 89 uvicorn 90 + wheel 85 91 wsproto 86 92 zeroconf 87 93 ]