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
2019-07-28 12:11:37 +02:00
parent 3a14d2750b c40307b8c9
commit cb3ce5d26d
26 changed files with 805 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4022,6 +4022,8 @@ in {
fixtures = callPackage ../development/python-modules/fixtures { };
fipy = callPackage ../development/python-modules/fipy { };
pelican = callPackage ../development/python-modules/pelican {
inherit (pkgs) glibcLocales git;
};
@@ -4287,6 +4289,8 @@ in {
pyspread = callPackage ../development/python-modules/pyspread { };
pysparse = callPackage ../development/python-modules/pysparse { };
pyupdate = callPackage ../development/python-modules/pyupdate {};
pyx = callPackage ../development/python-modules/pyx { };
@@ -4463,6 +4467,8 @@ in {
pyxattr = callPackage ../development/python-modules/pyxattr { };
pyamg = callPackage ../development/python-modules/pyamg { };
pyaml = callPackage ../development/python-modules/pyaml { };
pyyaml = callPackage ../development/python-modules/pyyaml { };
@@ -4693,6 +4699,8 @@ in {
scikit-tda = callPackage ../development/python-modules/scikit-tda { };
scikit-fmm = callPackage ../development/python-modules/scikit-fmm { };
scp = callPackage ../development/python-modules/scp {};
seaborn = callPackage ../development/python-modules/seaborn { };