Merge branch 'master' into staging

* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
This commit is contained in:
Orivej Desh
2017-10-03 17:46:39 +00:00
88 changed files with 1417 additions and 656 deletions

View File

@@ -0,0 +1,32 @@
{ stdenv, buildPythonPackage, fetchPypi
, arrow, bottle, click_5, colorama
, lockfile, pyserial, requests
, semantic-version
, isPy3k, isPyPy
}:
buildPythonPackage rec {
disabled = isPy3k || isPyPy;
pname = "platformio";
version="3.4.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1b4lba672l851sv1xwc320xbh46x7hx4ms6whc0k37hxkxj0nwm2";
};
propagatedBuildInputs = [
arrow bottle click_5 colorama
lockfile pyserial requests semantic-version
];
patches = [ ./fix-searchpath.patch ];
meta = with stdenv.lib; {
description = "An open source ecosystem for IoT development";
homepage = http://platformio.org;
maintainers = with maintainers; [ mog makefu ];
license = licenses.asl20;
};
}

View File

@@ -0,0 +1,11 @@
--- ./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 @@
isdir(join(p, "click")) or isdir(join(p, "platformio")))
if all(conditions):
_PYTHONPATH.append(p)
- os.environ['PYTHONPATH'] = os.pathsep.join(_PYTHONPATH)
+ os.environ['PYTHONPATH'] = os.pathsep.join(sys.path)
def get_serialports(filter_hwid=False):

View File

@@ -0,0 +1,21 @@
{ lib, fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
pname = "pyserial";
version="3.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "09y68bczw324a4jb9a1cfwrbjhq179vnfkkkrybbksp0vqgl0bbf";
};
checkPhase = "python -m unittest discover -s test";
meta = with lib; {
homepage = "https://github.com/pyserial/pyserial";
license = licenses.psfl;
description = "Python serial port extension";
maintainers = with maintainers; [ makefu ];
};
}

View File

@@ -0,0 +1,21 @@
{ lib, fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
pname = "semantic_version";
version = "2.6.0";
name = "${pname}${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra";
};
# ModuleNotFoundError: No module named 'tests'
doCheck = false;
meta = with lib; {
description = "A library implementing the 'SemVer' scheme";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ layus makefu ];
};
}