platformio: 3.6.6 -> 4.0.3
This commit is contained in:
parent
8edc31aa35
commit
501e5bd1e8
|
@ -3,19 +3,8 @@
|
|||
let
|
||||
pio-pkgs = pkgs:
|
||||
let
|
||||
python = pkgs.python.override {
|
||||
python = pkgs.python3.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";
|
||||
};
|
||||
postPatch = "";
|
||||
});
|
||||
|
||||
platformio = self.callPackage ./core.nix { };
|
||||
};
|
||||
};
|
||||
|
@ -38,7 +27,7 @@ in buildFHSUserEnv {
|
|||
|
||||
meta = with lib; {
|
||||
description = "An open source ecosystem for IoT development";
|
||||
homepage = http://platformio.org;
|
||||
homepage = "https://platformio.org";
|
||||
maintainers = with maintainers; [ mog ];
|
||||
license = licenses.asl20;
|
||||
platforms = with platforms; linux;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, buildPythonApplication, fetchFromGitHub
|
||||
, bottle, click, colorama
|
||||
, lockfile, pyserial, requests
|
||||
, pytest, semantic-version, tox
|
||||
, pytest, semantic-version, tox, tabulate
|
||||
, git
|
||||
}:
|
||||
|
||||
|
@ -35,6 +35,7 @@ let
|
|||
"test_builder.py::test_build_unflags"
|
||||
"test_misc.py::test_api_cache"
|
||||
"test_misc.py::test_ping_internet_ips"
|
||||
"test_misc.py::test_platformio_cli"
|
||||
"test_pkgmanifest.py::test_packages"
|
||||
]) ++ (map (e: "--ignore=tests/${e}") [
|
||||
"commands/test_boards.py"
|
||||
|
@ -46,19 +47,20 @@ let
|
|||
|
||||
in buildPythonApplication rec {
|
||||
pname = "platformio";
|
||||
version = "3.6.6";
|
||||
version = "4.0.3";
|
||||
|
||||
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformio";
|
||||
repo = "platformio-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qwd6684y2xagl375sv8fm6a535hcdqx296hknjlbvsgc1jc514a";
|
||||
sha256 = "1naaa53cc7n7zyqggqjvvgkcq8cyzngdf904y9ag0x1vvb70f8j9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bottle click colorama git lockfile
|
||||
pyserial requests semantic-version
|
||||
tabulate
|
||||
];
|
||||
|
||||
HOME = "/tmp";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- ./platformio/util.py-old 2017-09-29 01:20:08.174548250 +0200
|
||||
+++ ./platformio/util.py 2017-09-29 01:19:48.410485308 +0200
|
||||
@@ -395,7 +395,7 @@
|
||||
--- ./platformio/proc.py-old 2017-09-29 01:20:08.174548250 +0200
|
||||
+++ ./platformio/proc.py 2017-09-29 01:19:48.410485308 +0200
|
||||
@@ -164,7 +164,7 @@
|
||||
isdir(join(p, "click")) or isdir(join(p, "platformio")))
|
||||
if all(conditions):
|
||||
_PYTHONPATH.append(p)
|
||||
|
|
Loading…
Reference in a new issue