diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-06-19 14:10:36 +0200 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-06-19 14:10:36 +0200 |
| commit | a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424 (patch) | |
| tree | d56057fe59b8db02a2b06a05b8ed40f5f32621e3 /pkgs/top-level | |
| parent | 9ceeb77bd35708e4aff0da429bc3658adec9d410 (diff) | |
| parent | 01bbc613648008b2b54b9405b6c159cfac42f815 (diff) | |
| download | nixlib-a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424.tar nixlib-a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424.tar.gz nixlib-a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424.tar.bz2 nixlib-a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424.tar.lz nixlib-a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424.tar.xz nixlib-a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424.tar.zst nixlib-a975f6d8c5f4ab6bcc7ba05a0627b4d068a1f424.zip | |
Merge pull request #3016 from danielzinn/add_cuda_6
Added cuda6 compiler as package cudatoolkit6.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c292f130c2a..b17a38ad1f06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -821,10 +821,16 @@ let cron = callPackage ../tools/system/cron { }; - cudatoolkit = callPackage ../development/compilers/cudatoolkit { + cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix { python = python26; }; + cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix { + python = python26; + }; + + cudatoolkit = cudatoolkit5; + curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; zlibSupport = true; |