diff options
author | Ales Huzik <me@aguzik.net> | 2018-12-21 22:57:16 +1100 |
---|---|---|
committer | Ales Huzik <me@aguzik.net> | 2018-12-21 22:57:16 +1100 |
commit | 8e4651f917271caf90f032d1d04311a71acc793d (patch) | |
tree | cf4db40a026b805dd403604a7a9d8c792ee28447 | |
parent | e0561cbaddce35618cc941fb55e4964b85e45746 (diff) | |
download | nixpkgs-8e4651f917271caf90f032d1d04311a71acc793d.tar nixpkgs-8e4651f917271caf90f032d1d04311a71acc793d.tar.gz nixpkgs-8e4651f917271caf90f032d1d04311a71acc793d.tar.bz2 nixpkgs-8e4651f917271caf90f032d1d04311a71acc793d.tar.lz nixpkgs-8e4651f917271caf90f032d1d04311a71acc793d.tar.xz nixpkgs-8e4651f917271caf90f032d1d04311a71acc793d.tar.zst nixpkgs-8e4651f917271caf90f032d1d04311a71acc793d.zip |
terra: 2016-06-09 -> 1.0.0-beta1
-rw-r--r-- | pkgs/development/compilers/terra/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 98795f96ffa..448692fdd31 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }: let - luajitArchive = "LuaJIT-2.0.4.tar.gz"; + luajitArchive = "LuaJIT-2.0.5.tar.gz"; luajitSrc = fetchurl { url = "http://luajit.org/download/${luajitArchive}"; - sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; + sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; }; in stdenv.mkDerivation rec { name = "terra-git-${version}"; - version = "2016-06-09"; + version = "1.0.0-beta1"; src = fetchFromGitHub { owner = "zdevito"; repo = "terra"; - rev = "22696f178be8597af555a296db804dba820638ba"; - sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g"; + rev = "release-${version}"; + sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c"; }; outputs = [ "bin" "dev" "out" "static" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7082c1ff536..75b94095779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7553,9 +7553,7 @@ in tbb = callPackage ../development/libraries/tbb { }; terra = callPackage ../development/compilers/terra { - llvmPackages = llvmPackages_38 // { - llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; }; - }; + llvmPackages = llvmPackages_6; lua = lua5_1; }; |