Unverified Commit 48c34e40 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #180777 from elliottslaughter/terra-1.0.4

terra: 1.0.0-beta5 -> 1.0.4
parents 5fc479cd 3593e17c
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@
, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false }:

let
  luajitRev = "9143e86498436892cb4316550be4d45b68a61224";
  luajitRev = "6053b04815ecbc8eec1e361ceb64e68fb8fac1b3";
  luajitBase = "LuaJIT-${luajitRev}";
  luajitArchive = "${luajitBase}.tar.gz";
  luajitSrc = fetchFromGitHub {
    owner = "LuaJIT";
    repo = "LuaJIT";
    rev = luajitRev;
    sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b";
    sha256 = "1caxm1js877mky8hci1km3ycz2hbwpm6xbyjha72gfc7lr6pc429";
  };

  llvmMerged = symlinkJoin {
@@ -30,13 +30,13 @@ let

in stdenv.mkDerivation rec {
  pname = "terra";
  version = "1.0.0-beta5";
  version = "1.0.4";

  src = fetchFromGitHub {
    owner = "terralang";
    repo = "terra";
    rev = "bcc5a81649cb91aaaff33790b39c87feb5f7a4c2";
    sha256 = "0jb147vbvix3zvrq6ln321jdxjgr6z68pdrirjp4zqmx78yqlcx3";
    rev = "release-${version}";
    sha256 = "07715qsc316h0mmsjifr1ja5fbp216ji70hpq665r0v5ikiqjfsv";
  };

  nativeBuildInputs = [ cmake ];