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
2018-12-19 09:00:36 +01:00
parent db0211c6bc 911d1853ca
commit 9ab61ab8e2
225 changed files with 2499 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1617,11 +1617,10 @@ in {
easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
eccodes = disabledIf (!isPy27)
(toPythonModule (pkgs.eccodes.override {
enablePython = true;
pythonPackages = self;
}));
eccodes = toPythonModule (pkgs.eccodes.override {
enablePython = true;
pythonPackages = self;
});
EditorConfig = callPackage ../development/python-modules/editorconfig { };
@@ -4338,8 +4337,6 @@ in {
py = python.override{x11Support=true;};
in callPackage ../development/python-modules/tkinter { py = py; };
tlslite = throw "deprecated 2018-12-10; use pythonPackages.tlslite-ng instead";
tlslite-ng = callPackage ../development/python-modules/tlslite-ng { };
qrcode = callPackage ../development/python-modules/qrcode { };