Merge pull request #52624 from alesguzik/update-terra
terra: 2016-06-09 -> 1.0.0-beta1
This commit is contained in:
commit
6e5caa3f8a
|
@ -1,22 +1,22 @@
|
||||||
{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
|
{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
|
||||||
|
|
||||||
let
|
let
|
||||||
luajitArchive = "LuaJIT-2.0.4.tar.gz";
|
luajitArchive = "LuaJIT-2.0.5.tar.gz";
|
||||||
luajitSrc = fetchurl {
|
luajitSrc = fetchurl {
|
||||||
url = "http://luajit.org/download/${luajitArchive}";
|
url = "http://luajit.org/download/${luajitArchive}";
|
||||||
sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
|
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "terra-git-${version}";
|
name = "terra-git-${version}";
|
||||||
version = "2016-06-09";
|
version = "1.0.0-beta1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zdevito";
|
owner = "zdevito";
|
||||||
repo = "terra";
|
repo = "terra";
|
||||||
rev = "22696f178be8597af555a296db804dba820638ba";
|
rev = "release-${version}";
|
||||||
sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g";
|
sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "static" ];
|
outputs = [ "bin" "dev" "out" "static" ];
|
||||||
|
|
|
@ -7624,9 +7624,7 @@ in
|
||||||
tbb = callPackage ../development/libraries/tbb { };
|
tbb = callPackage ../development/libraries/tbb { };
|
||||||
|
|
||||||
terra = callPackage ../development/compilers/terra {
|
terra = callPackage ../development/compilers/terra {
|
||||||
llvmPackages = llvmPackages_38 // {
|
llvmPackages = llvmPackages_6;
|
||||||
llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; };
|
|
||||||
};
|
|
||||||
lua = lua5_1;
|
lua = lua5_1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue