alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

terra: 1.0.4 -> 1.0.5 (#187065)

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Elliott Slaughter 2022-08-20 18:10:19 -07:00 committed by GitHub
parent e79f2f13d9
commit 4376b54e76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/compilers/terra/default.nix
View file

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

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

@ -14566,7 +14566,9 @@ with pkgs;
tbb = callPackage ../development/libraries/tbb { };
terra = callPackage ../development/compilers/terra {
llvmPackages = llvmPackages_10;
llvmPackages = llvmPackages_11;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
};
teyjus = callPackage ../development/compilers/teyjus (