From a3b7b770cec93c0f9714090b09659588ce78aa4b Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 1 Nov 2022 11:52:31 -0700 Subject: [PATCH 1/2] platformio: work around fallout from #194205 fixes #198319 --- pkgs/development/embedded/platformio/chrootenv.nix | 7 ++----- pkgs/development/embedded/platformio/core.nix | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index fbabfe982de0..75f9adf0d3e6 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -3,11 +3,8 @@ let pio-pkgs = pkgs: let - python = pkgs.python3.override { - packageOverrides = self: super: { - platformio = self.callPackage ./core.nix { inherit version src; }; - }; - }; + python = pkgs.python3; + platformio = python.pkgs.callPackage ./core.nix { inherit version src; }; in (with pkgs; [ zlib diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index fcb4e7d5fda3..d553477babba 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -22,6 +22,7 @@ with python3.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \ + --replace 'aiofiles==0.8.*' 'aiofiles==22.1.*' \ --replace 'wsproto==' 'wsproto>=' ''; From 6a01d889b387d2b0212c1d2ccb14a8b2724f1eaa Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 7 Nov 2022 07:48:42 -0800 Subject: [PATCH 2/2] platformio: unmark as broken on aarch64-linux --- pkgs/development/embedded/platformio/core.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index d553477babba..bcbcbdcb2cac 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -148,6 +148,5 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; - broken = stdenv.isAarch64; }; }