diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:27 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:27 +0200 |
| commit | 7f40cfd97b4df5bcb039c0efb0710abf47b849b8 (patch) | |
| tree | 4e50776f6c5bec1482844b1637e5fe9aa3c37d88 /pkgs/top-level/python-packages.nix | |
| parent | ade7faea7214fbb7d0879804e59b3fb9a61d6268 (diff) | |
| parent | 567f0a3df11b67572a52a05766fe258787bace9a (diff) | |
| download | nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.gz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.bz2 nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.lz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.xz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.zst nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d08e66c809b..e92067413937 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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; }; |