platformio: move out of pythonPackages
This commit is contained in:
parent
a7bcc079fa
commit
c664dc8d19
|
@ -1,23 +1,40 @@
|
|||
{ stdenv, lib, buildFHSUserEnv
|
||||
}:
|
||||
{ lib, buildFHSUserEnv }:
|
||||
|
||||
let
|
||||
pio-pkgs = pkgs: (with pkgs;
|
||||
[
|
||||
python27Packages.python
|
||||
python27Packages.setuptools
|
||||
python27Packages.pip
|
||||
python27Packages.bottle
|
||||
python27Packages.platformio
|
||||
pio-pkgs = pkgs:
|
||||
let
|
||||
python = pkgs.python.override {
|
||||
packageOverrides = self: super: {
|
||||
|
||||
# https://github.com/platformio/platformio-core/issues/349
|
||||
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 ];
|
||||
|
|
|
@ -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
|
||||
];
|
||||
|
|
@ -10084,7 +10084,6 @@ in {
|
|||
};
|
||||
|
||||
pika-pool = callPackage ../development/python-modules/pika-pool { };
|
||||
platformio = callPackage ../development/python-modules/platformio { };
|
||||
|
||||
kmsxx = callPackage ../development/libraries/kmsxx { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue