Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
John Ericson
2018-05-23 16:00:04 -04:00
24 changed files with 803 additions and 1241 deletions

View File

@@ -5162,6 +5162,7 @@ in {
};
};
effect = callPackage ../development/python-modules/effect {};
elpy = buildPythonPackage rec {
name = "elpy-${version}";
@@ -9892,25 +9893,7 @@ in {
pybase64 = callPackage ../development/python-modules/pybase64 { };
pylibconfig2 = buildPythonPackage rec {
name = "pylibconfig2-${version}";
version = "0.2.4";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pylibconfig2/${name}.tar.gz";
sha256 = "0kyg6gldj6hi2jhc5xhi834bb2mcaiy24dvfik963shnldqr7kqg";
};
doCheck = false;
propagatedBuildInputs = with self ; [ pyparsing ];
meta = {
homepage = https://github.com/heinzK1X/pylibconfig2;
description = "Pure python library for libconfig syntax";
license = licenses.gpl3;
};
};
pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
pylibmc = callPackage ../development/python-modules/pylibmc {};