Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 38db6fdfb967
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b5a3294493b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 1, 2018

  1. platformio: 3.5.3 -> 3.6.1

    @peterhoeg
    peterhoeg committed Nov 1, 2018
    Copy the full SHA
    718d3ae View commit details

  2. Merge pull request #49460 from peterhoeg/u/pio 

    platformio: 3.5.3 -> 3.6.1
    @peterhoeg
    peterhoeg authored Nov 1, 2018
    Copy the full SHA
    7b5a329 View commit details
Showing with 61 additions and 8 deletions.
  1. +61 −8 pkgs/development/arduino/platformio/core.nix
69 changes: 61 additions & 8 deletions pkgs/development/arduino/platformio/core.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,83 @@
{ stdenv, buildPythonPackage, fetchPypi
{ stdenv, lib, buildPythonApplication, fetchFromGitHub
, bottle, click, colorama
, lockfile, pyserial, requests
, semantic-version
, pytest, semantic-version, tox
, git
}:

buildPythonPackage rec {
let
args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [
"commands/test_ci.py::test_ci_boards"
"commands/test_ci.py::test_ci_project_conf"
"commands/test_ci.py::test_ci_lib_and_board"
"commands/test_init.py::test_init_enable_auto_uploading"
"commands/test_init.py::test_init_custom_framework"
"commands/test_init.py::test_init_incorrect_board"
"commands/test_init.py::test_init_ide_atom"
"commands/test_init.py::test_init_ide_eclipse"
"commands/test_init.py::test_init_duplicated_boards"
"commands/test_init.py::test_init_special_board"
"commands/test_lib.py::test_search"
"commands/test_lib.py::test_install_duplicates"
"commands/test_lib.py::test_global_lib_update_check"
"commands/test_lib.py::test_global_lib_update"
"commands/test_lib.py::test_global_lib_uninstall"
"commands/test_lib.py::test_lib_show"
"commands/test_lib.py::test_lib_stats"
"commands/test_lib.py::test_global_install_registry"
"commands/test_lib.py::test_global_install_archive"
"commands/test_lib.py::test_global_install_repository"
"commands/test_lib.py::test_global_lib_list"
"commands/test_test.py::test_local_env"
"test_builder.py::test_build_flags"
"test_builder.py::test_build_unflags"
"test_misc.py::test_api_cache"
"test_misc.py::test_ping_internet_ips"
"test_pkgmanifest.py::test_packages"
]) ++ (map (e: "--ignore=tests/${e}") [
"commands/test_boards.py"
"commands/test_platform.py"
"commands/test_update.py"
"test_maintenance.py"
"test_ino2cpp.py"
]));

in buildPythonApplication rec {
pname = "platformio";
version = "3.5.3";
version = "3.6.1";

src = fetchPypi {
inherit pname version;
sha256 = "1l4s2xh1p9h767amk9zapzivz4irl2y3kff3dna6icvsgq6rz011";
# pypi tarball doesn't contain tests
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
sha256 = "01xz9figqrzb0m9467q14lg51vmgq0hbaap0xdx08n5v2ycmzj0v";
};

propagatedBuildInputs = [
bottle click colorama git lockfile
pyserial requests semantic-version
];

HOME = "/tmp";

checkInputs = [ pytest tox ];

checkPhase = ''
runHook preCheck
py.test -v tests ${args}
runHook postCheck
'';

patches = [ ./fix-searchpath.patch ];

meta = with stdenv.lib; {
broken = stdenv.isAarch64;
description = "An open source ecosystem for IoT development";
homepage = http://platformio.org;
maintainers = with maintainers; [ mog makefu ];
license = licenses.asl20;
maintainers = with maintainers; [ mog makefu ];
};
}