about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2019-09-18 22:13:18 -0500
committerAustin Seipp <aseipp@pobox.com>2019-09-18 22:13:18 -0500
commit52d3655c3d5fcb83b6dbb054b272007270849bb3 (patch)
treef488e4f3ccb1fa2285826ee17395116daececce9 /pkgs
parent3288d3670feaec0d1d9cc2d95fca6a76301474db (diff)
downloadnixlib-52d3655c3d5fcb83b6dbb054b272007270849bb3.tar
nixlib-52d3655c3d5fcb83b6dbb054b272007270849bb3.tar.gz
nixlib-52d3655c3d5fcb83b6dbb054b272007270849bb3.tar.bz2
nixlib-52d3655c3d5fcb83b6dbb054b272007270849bb3.tar.lz
nixlib-52d3655c3d5fcb83b6dbb054b272007270849bb3.tar.xz
nixlib-52d3655c3d5fcb83b6dbb054b272007270849bb3.tar.zst
nixlib-52d3655c3d5fcb83b6dbb054b272007270849bb3.zip
terra: 1.0.0-beta1 -> 1.0.0pre1175_ef6a75f
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/terra/default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index 371009af5ff2..edab1cb0df2b 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -5,22 +5,24 @@
 let
   luajitArchive = "LuaJIT-2.0.5.tar.gz";
   luajitSrc = fetchurl {
-    url = "http://luajit.org/download/${luajitArchive}";
+    url    = "http://luajit.org/download/${luajitArchive}";
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
   };
 in
 
 stdenv.mkDerivation rec {
-  pname = "terra-git";
-  version = "1.0.0-beta1";
+  pname = "terra";
+  version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
-    owner = "zdevito";
-    repo = "terra";
-    rev = "release-${version}";
-    sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
+    owner  = "zdevito";
+    repo   = "terra";
+    rev    = "ef6a75ffee15a30f3c74f4e6943851cfbc0fec3d";
+    sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s";
   };
 
+  hardeningDisable = [ "fortify" ];
+
   outputs = [ "bin" "dev" "out" "static" ];
 
   patches = [ ./nix-cflags.patch ];