platformio: move out of pythonPackages

pkgs/development/arduino/platformio/chrootenv.nix

@@ -1,23 +1,40 @@
-{ stdenv, lib, buildFHSUserEnv
+{ lib, buildFHSUserEnv }:
-}:
+
 let
-  pio-pkgs = pkgs: (with pkgs;
+  pio-pkgs = pkgs:
-    [
+    let
-      python27Packages.python
+      python = pkgs.python.override {
-      python27Packages.setuptools
+        packageOverrides = self: super: {
-      python27Packages.pip
+
-      python27Packages.bottle
+          # https://github.com/platformio/platformio-core/issues/349
-      python27Packages.platformio
+          click = super.click.overridePythonAttrs (oldAttrs: rec {
+            version = "5.1";
+            src = oldAttrs.src.override {
+              inherit version;
+              sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a";
+            };
+          });
+
+          platformio = self.callPackage ./core.nix { };
+        };
+      };
+    in (with pkgs; [
       zlib
+    ]) ++ (with python.pkgs; [
+      python
+      setuptools
+      pip
+      bottle
+      platformio
     ]);
-in
+
-buildFHSUserEnv {
+in buildFHSUserEnv {
   name = "platformio";
 
   targetPkgs = pio-pkgs;
   multiPkgs = pio-pkgs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An open source ecosystem for IoT development";
     homepage = http://platformio.org;
     maintainers = with maintainers; [ mog ];

pkgs/development/arduino/platformio/core.nix

@@ -1,16 +1,13 @@
 { stdenv, buildPythonPackage, fetchPypi
-, bottle, click_5, colorama
+, bottle, click, colorama
 , lockfile, pyserial, requests
 , semantic-version
-, isPy3k, isPyPy
 , git
 }:
-buildPythonPackage rec {
-  disabled = isPy3k || isPyPy;
 
+buildPythonPackage rec {
   pname = "platformio";
   version="3.5.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -18,7 +15,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs =  [
-    bottle click_5 colorama git lockfile
+    bottle click colorama git lockfile
     pyserial requests semantic-version
   ];
 

pkgs/top-level/python-packages.nix

@@ -10084,7 +10084,6 @@ in {
   };
 
   pika-pool = callPackage ../development/python-modules/pika-pool { };
-  platformio = callPackage ../development/python-modules/platformio { };
 
   kmsxx = callPackage ../development/libraries/kmsxx { };