public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-26 14:45:31 +02:00
parent 883a1dffcf c9793b81b8
commit 0f6bda38fe
38 changed files with 460 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/top-level/python-packages.nix
View File

@@ -684,10 +684,12 @@ in {
maxminddb = callPackage ../development/python-modules/maxminddb { };
monty = callPackage ../development/python-modules/monty { };
mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py;
mkl-service = callPackage ../development/python-modules/mkl-service { };
monty = callPackage ../development/python-modules/monty { };
mpi4py = callPackage ../development/python-modules/mpi4py {
mpi = pkgs.openmpi;
};
@@ -1473,6 +1475,8 @@ in {
capstone = callPackage ../development/python-modules/capstone { };
capturer = callPackage ../development/python-modules/capturer { };
cement = callPackage ../development/python-modules/cement {};
cgen = callPackage ../development/python-modules/cgen { };
@@ -1497,6 +1501,8 @@ in {
colorcet = callPackage ../development/python-modules/colorcet { };
coloredlogs = callPackage ../development/python-modules/coloredlogs { };
colorclass = callPackage ../development/python-modules/colorclass {};
colorlog = callPackage ../development/python-modules/colorlog { };
@@ -2186,6 +2192,8 @@ in {
execnet = callPackage ../development/python-modules/execnet { };
executor = callPackage ../development/python-modules/executor { };
ezdxf = callPackage ../development/python-modules/ezdxf {};
facebook-sdk = callPackage ../development/python-modules/facebook-sdk { };
@@ -2460,6 +2468,8 @@ in {
natsort = callPackage ../development/python-modules/natsort { };
naturalsort = callPackage ../development/python-modules/naturalsort { };
ncclient = callPackage ../development/python-modules/ncclient {};
logfury = callPackage ../development/python-modules/logfury { };
@@ -2677,6 +2687,8 @@ in {
roman = callPackage ../development/python-modules/roman { };
rotate-backups = callPackage ../tools/backup/rotate-backups { };
librosa = callPackage ../development/python-modules/librosa { };
samplerate = callPackage ../development/python-modules/samplerate { };
@@ -4109,6 +4121,8 @@ in {
prettytable = callPackage ../development/python-modules/prettytable { };
property-manager = callPackage ../development/python-modules/property-manager { };
prompt_toolkit = let
filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix;
in callPackage filename { };
@@ -4440,6 +4454,21 @@ in {
pyyaml = callPackage ../development/python-modules/pyyaml { };
pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec {
version = "3.13";
src = oldAttrs.src.override {
inherit version;
sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
};
# https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
patches = singleton (pkgs.fetchpatch {
url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch";
sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn";
});
# https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
doCheck = false;
});
rabbitpy = callPackage ../development/python-modules/rabbitpy { };
rasterio = callPackage ../development/python-modules/rasterio {
@@ -4833,6 +4862,8 @@ in {
update-copyright = callPackage ../development/python-modules/update-copyright {};
update-dotdee = callPackage ../development/python-modules/update-dotdee { };
uritemplate = callPackage ../development/python-modules/uritemplate { };
uproot = callPackage ../development/python-modules/uproot {};
@@ -4845,6 +4876,8 @@ in {
user-agents = callPackage ../development/python-modules/user-agents { };
verboselogs = callPackage ../development/python-modules/verboselogs { };
vega_datasets = callPackage ../development/python-modules/vega_datasets { };
virtkey = callPackage ../development/python-modules/virtkey {