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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2020-05-18 21:09:27 +02:00
parent ade7faea72 567f0a3df1
commit 7f40cfd97b
501 changed files with 11984 additions and 6526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+8 -1
View File
@@ -1607,6 +1607,13 @@ in {
vdf = callPackage ../development/python-modules/vdf { };
vdirsyncer = callPackage ../development/python-modules/vdirsyncer {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security;
inherit (pkgs) pkg-config openssl rustPlatform;
};
vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { };
vidstab = callPackage ../development/python-modules/vidstab { };
webapp2 = callPackage ../development/python-modules/webapp2 { };
@@ -3263,7 +3270,7 @@ in {
pycares = callPackage ../development/python-modules/pycares { };
pycuda = callPackage ../development/python-modules/pycuda {
cudatoolkit = pkgs.cudatoolkit_7_5;
cudatoolkit = pkgs.cudatoolkit;
inherit (pkgs.stdenv) mkDerivation;
};