diff options
author | Elliott Slaughter <elliottslaughter@gmail.com> | 2022-08-20 18:10:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-21 03:10:19 +0200 |
commit | 4376b54e768edc4782df2f624dbabaf8333e21c6 (patch) | |
tree | 0a114c7322fed6bc9c0d2560fa6f8e52bfb707dc /pkgs/development/compilers/terra | |
parent | e79f2f13d961e4499cf526ca8bd9467f6f2301f9 (diff) |
terra: 1.0.4 -> 1.0.5 (#187065)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/development/compilers/terra')
-rw-r--r-- | pkgs/development/compilers/terra/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 2d853795cf9c9..e9fcb9379a1cc 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,15 +1,17 @@ { lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2 -, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false }: +, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false +, libobjc, Cocoa, Foundation +}: let - luajitRev = "6053b04815ecbc8eec1e361ceb64e68fb8fac1b3"; + luajitRev = "50936d784474747b4569d988767f1b5bab8bb6d0"; luajitBase = "LuaJIT-${luajitRev}"; luajitArchive = "${luajitBase}.tar.gz"; luajitSrc = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; rev = luajitRev; - sha256 = "1caxm1js877mky8hci1km3ycz2hbwpm6xbyjha72gfc7lr6pc429"; + sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0"; }; llvmMerged = symlinkJoin { @@ -30,17 +32,19 @@ let in stdenv.mkDerivation rec { pname = "terra"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "terralang"; repo = "terra"; rev = "release-${version}"; - sha256 = "07715qsc316h0mmsjifr1ja5fbp216ji70hpq665r0v5ikiqjfsv"; + sha256 = "080h718y3r3ca6jlxc985g3dac4q5ysqcalg3h0jl9bxm6rssv50"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmMerged ncurses libxml2 ] ++ lib.optional enableCUDA cuda; + buildInputs = [ llvmMerged ncurses libxml2 ] + ++ lib.optionals enableCUDA [ cuda ] + ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ]; cmakeFlags = [ "-DHAS_TERRA_VERSION=0" @@ -80,10 +84,9 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "A low-level counterpart to Lua"; homepage = "https://terralang.org/"; - platforms = platforms.x86_64; + platforms = platforms.x86_64 ++ platforms.linux; maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ]; license = licenses.mit; }; |