pyrox.dev
terra: 1.1.0 -> 1.2.0
+8
-10
pkgs/by-name/te/terra/package.nix
+8
-10
pkgs/by-name/te/terra/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchFromGitHub,
5
-
llvmPackages_16,
5
+
llvmPackages_18,
6
6
ncurses,
7
7
cmake,
8
8
libxml2,
···
14
14
}:
15
15
16
16
let
17
-
luajitRev = "50936d784474747b4569d988767f1b5bab8bb6d0";
17
+
luajitRev = "83954100dba9fc0cf5eeaf122f007df35ec9a604";
18
18
luajitBase = "LuaJIT-${luajitRev}";
19
19
luajitArchive = "${luajitBase}.tar.gz";
20
20
luajitSrc = fetchFromGitHub {
21
21
owner = "LuaJIT";
22
22
repo = "LuaJIT";
23
23
rev = luajitRev;
24
-
sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0";
24
+
hash = "sha256-L9T6lc32dDLAp9hPI5mKOzT0c4juW9JHA3FJCpm7HNQ=";
25
25
};
26
26
27
-
llvmPackages = llvmPackages_16;
27
+
llvmPackages = llvmPackages_18;
28
28
llvmMerged = symlinkJoin {
29
29
name = "llvmClangMerged";
30
30
paths = with llvmPackages; [
···
37
37
];
38
38
};
39
39
40
-
cuda = cudaPackages.cudatoolkit_11;
40
+
cuda = cudaPackages.cudatoolkit;
41
41
42
42
clangVersion = llvmPackages.clang-unwrapped.version;
43
43
44
44
in
45
45
stdenv.mkDerivation rec {
46
46
pname = "terra";
47
-
version = "1.1.0";
47
+
version = "1.2.0";
48
48
49
49
src = fetchFromGitHub {
50
50
owner = "terralang";
51
51
repo = "terra";
52
52
rev = "release-${version}";
53
-
sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd";
53
+
hash = "sha256-CukNCvTHZUhjdHyvDUSH0YCVNkThUFPaeyLepyEKodA=";
54
54
};
55
55
56
56
nativeBuildInputs = [ cmake ];
···
65
65
66
66
cmakeFlags =
67
67
let
68
-
resourceDir =
69
-
"${llvmMerged}/lib/clang/"
70
-
+ (if lib.versionOlder clangVersion "16" then clangVersion else lib.versions.major clangVersion);
68
+
resourceDir = "${llvmMerged}/lib/clang/${lib.versions.major clangVersion}";
71
69
in
72
70
[
73
71
"-DHAS_TERRA_VERSION=0"