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-16 09:01:53 +01:00
parent da6239dab3 300846f3c9
commit 986c2d36da
169 changed files with 2938 additions and 1614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+3
View File
@@ -4140,6 +4140,7 @@ in {
notify-py = callPackage ../development/python-modules/notify-py { };
notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; };
notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; };
nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
@@ -5290,6 +5291,8 @@ in {
pyomo = callPackage ../development/python-modules/pyomo { };
phonemizer = callPackage ../development/python-modules/phonemizer { };
pyopencl = callPackage ../development/python-modules/pyopencl { };
pyopengl = callPackage ../development/python-modules/pyopengl { };