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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-12 18:59:08 +01:00
parent 917400bcff 968b20e2c7
commit daf3297cb4
141 changed files with 1835 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1516,6 +1516,8 @@ in {
dopy = callPackage ../development/python-modules/dopy { };
dpath = callPackage ../development/python-modules/dpath { };
dpkt = callPackage ../development/python-modules/dpkt {};
urllib3 = callPackage ../development/python-modules/urllib3 {};
@@ -2222,8 +2224,6 @@ in {
pyfribidi = callPackage ../development/python-modules/pyfribidi { };
docker_compose = callPackage ../development/python-modules/docker_compose {};
pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
fdroidserver = callPackage ../development/python-modules/fdroidserver { };
@@ -2468,6 +2468,8 @@ in {
hetzner = callPackage ../development/python-modules/hetzner { };
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
htmllaundry = callPackage ../development/python-modules/htmllaundry { };
html5lib = callPackage ../development/python-modules/html5lib { };
@@ -2746,9 +2748,11 @@ in {
mathics = callPackage ../development/python-modules/mathics { };
matplotlib = callPackage ../development/python-modules/matplotlib {
matplotlib = let
path = if isPy3k then ../development/python-modules/matplotlib/default.nix else
../development/python-modules/matplotlib/2.nix;
in callPackage path {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
enableGhostscript = true;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
};
@@ -3030,6 +3034,8 @@ in {
ply = callPackage ../development/python-modules/ply { };
plyplus = callPackage ../development/python-modules/plyplus { };
plyvel = callPackage ../development/python-modules/plyvel { };
osc = callPackage ../development/python-modules/osc { };
@@ -3247,12 +3253,6 @@ in {
protobuf = pkgs.protobuf;
};
protobuf3_1 = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_1;
};
psd-tools = callPackage ../development/python-modules/psd-tools { };
psutil = callPackage ../development/python-modules/psutil { };
@@ -4898,6 +4898,8 @@ in {
inherit python;
})).python;
scour = callPackage ../development/python-modules/scour { };
});
in fix' (extends overrides packages)