BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #68087 from peterhoeg/u/pio4

Browse source 
platformio: 3.6.6 -> 4.0.3
This commit is contained in:
Marek Mahut 2019-09-05 08:59:35 +02:00 committed by GitHub
commit 1a5d105e04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/arduino/platformio/chrootenv.nix
View file

@ -3,19 +3,8 @@
let let
pio-pkgs = pkgs: pio-pkgs = pkgs:
let let
python = pkgs.python.override { python = pkgs.python3.override {
packageOverrides = self: super: { 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 { }; platformio = self.callPackage ./core.nix { };
}; };
}; };
@ -38,7 +27,7 @@ in buildFHSUserEnv {
meta = with lib; { meta = with lib; {
description = "An open source ecosystem for IoT development"; description = "An open source ecosystem for IoT development";
homepage = http://platformio.org; homepage = "https://platformio.org";
maintainers = with maintainers; [ mog ]; maintainers = with maintainers; [ mog ];
license = licenses.asl20; license = licenses.asl20;
platforms = with platforms; linux; platforms = with platforms; linux;

8
pkgs/development/arduino/platformio/core.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonApplication, fetchFromGitHub { stdenv, lib, buildPythonApplication, fetchFromGitHub
, bottle, click, colorama , bottle, click, colorama
, lockfile, pyserial, requests , lockfile, pyserial, requests
, pytest, semantic-version, tox , pytest, semantic-version, tox, tabulate
, git , git
}: }:
@ -35,6 +35,7 @@ let
"test_builder.py::test_build_unflags" "test_builder.py::test_build_unflags"
"test_misc.py::test_api_cache" "test_misc.py::test_api_cache"
"test_misc.py::test_ping_internet_ips" "test_misc.py::test_ping_internet_ips"
"test_misc.py::test_platformio_cli"
"test_pkgmanifest.py::test_packages" "test_pkgmanifest.py::test_packages"
]) ++ (map (e: "--ignore=tests/${e}") [ ]) ++ (map (e: "--ignore=tests/${e}") [
"commands/test_boards.py" "commands/test_boards.py"
@ -46,19 +47,20 @@ let
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "platformio"; pname = "platformio";
version = "3.6.6"; version = "4.0.3";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "platformio"; owner = "platformio";
repo = "platformio-core"; repo = "platformio-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qwd6684y2xagl375sv8fm6a535hcdqx296hknjlbvsgc1jc514a"; sha256 = "1naaa53cc7n7zyqggqjvvgkcq8cyzngdf904y9ag0x1vvb70f8j9";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
bottle click colorama git lockfile bottle click colorama git lockfile
pyserial requests semantic-version pyserial requests semantic-version
tabulate
]; ];
HOME = "/tmp"; HOME = "/tmp";

6
pkgs/development/arduino/platformio/fix-searchpath.patch
View file

@ -1,6 +1,6 @@
--- ./platformio/util.py-old 2017-09-29 01:20:08.174548250 +0200 --- ./platformio/proc.py-old 2017-09-29 01:20:08.174548250 +0200
+++ ./platformio/util.py 2017-09-29 01:19:48.410485308 +0200 +++ ./platformio/proc.py 2017-09-29 01:19:48.410485308 +0200
@@ -395,7 +395,7 @@ @@ -164,7 +164,7 @@
isdir(join(p, "click")) or isdir(join(p, "platformio"))) isdir(join(p, "click")) or isdir(join(p, "platformio")))
if all(conditions): if all(conditions):
_PYTHONPATH.append(p) _PYTHONPATH.append(p)

4
pkgs/development/python-modules/semantic-version/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "semantic_version"; pname = "semantic_version";
version = "2.6.0"; version = "2.8.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra"; sha256 = "1lnnpxmf3z1rcfr5n562vbraq236s13wlj8fmw2kwr2mrq7lqb8r";
}; };
# ModuleNotFoundError: No module named 'tests' # ModuleNotFoundError: No module named 'tests'