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

Merge pull request #52624 from alesguzik/update-terra

Browse Source 
terra: 2016-06-09 -> 1.0.0-beta1
This commit is contained in:
Ryan Mulligan 2019-02-28 19:22:10 -08:00 committed by GitHub
commit 6e5caa3f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/terra/default.nix
View File

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
let
luajitArchive = "LuaJIT-2.0.4.tar.gz";
luajitArchive = "LuaJIT-2.0.5.tar.gz";
luajitSrc = fetchurl {
url = "http://luajit.org/download/${luajitArchive}";
sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
};
in
stdenv.mkDerivation rec {
name = "terra-git-${version}";
version = "2016-06-09";
version = "1.0.0-beta1";
src = fetchFromGitHub {
owner = "zdevito";
repo = "terra";
rev = "22696f178be8597af555a296db804dba820638ba";
sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g";
rev = "release-${version}";
sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
};
outputs = [ "bin" "dev" "out" "static" ];

4
pkgs/top-level/all-packages.nix
View File

@ -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;
};