diff options
| author | Graham Christensen <graham@grahamc.com> | 2020-04-17 15:17:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 15:17:45 -0400 |
| commit | e42312e354f91300d20dbbdb6a82d1b5b257155f (patch) | |
| tree | e450bf8c785affcfda7a4004dc9af1c51d626e46 /pkgs/development | |
| parent | e9687df24a6219eeb01134b6cea2d45decc20024 (diff) | |
| parent | 24b3158efca85b551cf86b48320d231466c4f594 (diff) | |
| download | nixlib-e42312e354f91300d20dbbdb6a82d1b5b257155f.tar nixlib-e42312e354f91300d20dbbdb6a82d1b5b257155f.tar.gz nixlib-e42312e354f91300d20dbbdb6a82d1b5b257155f.tar.bz2 nixlib-e42312e354f91300d20dbbdb6a82d1b5b257155f.tar.lz nixlib-e42312e354f91300d20dbbdb6a82d1b5b257155f.tar.xz nixlib-e42312e354f91300d20dbbdb6a82d1b5b257155f.tar.zst nixlib-e42312e354f91300d20dbbdb6a82d1b5b257155f.zip | |
Merge pull request #85183 from Xe/zig-0.6.0
zig: upgrade to 0.6.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/zig/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/development/compilers/zig/llvm10_polly.patch | 10 |
2 files changed, 38 insertions, 6 deletions
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d547535c54be..20ce0b5ff5ee 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,25 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: -stdenv.mkDerivation rec { - version = "0.5.0"; +llvmPackages.stdenv.mkDerivation rec { + version = "0.6.0"; pname = "zig"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "0xyl0riakh6kwb3yvxihb451kqs4ai4q0aygqygnlb2rlr1dn1zb"; + sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; + buildInputs = [ + llvmPackages.clang-unwrapped + llvmPackages.llvm + llvmPackages.lld + libxml2 + zlib + ]; + + patches = [ + (substituteAll { + src = ./llvm10_polly.patch; + llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so"; + }) + ]; preBuild = '' export HOME=$TMPDIR; ''; + checkPhase = '' + runHook preCheck + ./zig test $src/test/stage1/behavior.zig + runHook postCheck + ''; + + doCheck = true; + meta = with stdenv.lib; { - description = "Programming languaged designed for robustness, optimality, and clarity"; + description = + "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; homepage = "https://ziglang.org/"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/compilers/zig/llvm10_polly.patch b/pkgs/development/compilers/zig/llvm10_polly.patch new file mode 100644 index 000000000000..72449c35d91f --- /dev/null +++ b/pkgs/development/compilers/zig/llvm10_polly.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97608cddf..e451c0711 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -369,4 +369,5 @@ target_link_libraries(zig_cpp LINK_PUBLIC + ${CLANG_LIBRARIES} + ${LLD_LIBRARIES} + ${LLVM_LIBRARIES} ++ @llvm_extras@ + ) |