diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2019-02-28 19:22:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 19:22:10 -0800 |
| commit | 6e5caa3f8ac48750233ef82a94825be238940825 (patch) | |
| tree | ae42a0e0245782f2f17d0bcb1fc491cf0eaaf956 /pkgs/top-level | |
| parent | 898870824d708fac857479f755ab38a657905abc (diff) | |
| parent | 8e4651f917271caf90f032d1d04311a71acc793d (diff) | |
| download | nixlib-6e5caa3f8ac48750233ef82a94825be238940825.tar nixlib-6e5caa3f8ac48750233ef82a94825be238940825.tar.gz nixlib-6e5caa3f8ac48750233ef82a94825be238940825.tar.bz2 nixlib-6e5caa3f8ac48750233ef82a94825be238940825.tar.lz nixlib-6e5caa3f8ac48750233ef82a94825be238940825.tar.xz nixlib-6e5caa3f8ac48750233ef82a94825be238940825.tar.zst nixlib-6e5caa3f8ac48750233ef82a94825be238940825.zip | |
Merge pull request #52624 from alesguzik/update-terra
terra: 2016-06-09 -> 1.0.0-beta1
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ef0f40e4c2b..41769d3bed0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7624,9 +7624,7 @@ in tbb = callPackage ../development/libraries/tbb { }; terra = callPackage ../development/compilers/terra { - llvmPackages = llvmPackages_38 // { - llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; }; - }; + llvmPackages = llvmPackages_6; lua = lua5_1; }; |