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
2020-11-03 12:06:06 +01:00
parent fe9f55907e 72c32ad3d7
commit 237966224d
317 changed files with 3210 additions and 2827 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+4 -2
View File
@@ -4272,7 +4272,7 @@ in {
ovh = callPackage ../development/python-modules/ovh { };
ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; });
ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; });
owslib = callPackage ../development/python-modules/owslib { };
@@ -7375,7 +7375,9 @@ in {
unicode-slugify = callPackage ../development/python-modules/unicode-slugify { };
unicorn = callPackage ../development/python-modules/unicorn { };
unicorn = callPackage ../development/python-modules/unicorn {
unicorn-emu = pkgs.unicorn;
};
unidecode = callPackage ../development/python-modules/unidecode { };