Merge pull request #59198 from dtzWill/update/zig-0.4.0

zig: 0.3.0 -> 0.4.0
This commit is contained in:
Pascal Wittmann 2019-04-09 11:18:55 +02:00 committed by GitHub
commit 8e76f22e57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions

View file

@ -1,23 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.3.0"; version = "0.4.0";
name = "zig-${version}"; pname = "zig";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ziglang"; owner = "ziglang";
repo = "zig"; repo = pname;
rev = "${version}"; rev = version;
sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm"; sha256 = "1cq6cc5pvybz9kn3y0j5gskkjq88hkmmcsva54mfzpcc65l3pv6p";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Programming languaged designed for robustness, optimality, and clarity"; description = "Programming languaged designed for robustness, optimality, and clarity";
homepage = https://ziglang.org/; homepage = https://ziglang.org/;

View file

@ -13389,7 +13389,7 @@ in
zmqpp = callPackage ../development/libraries/zmqpp { }; zmqpp = callPackage ../development/libraries/zmqpp { };
zig = callPackage ../development/compilers/zig { zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_7; llvmPackages = llvmPackages_8;
}; };
zimlib = callPackage ../development/libraries/zimlib { }; zimlib = callPackage ../development/libraries/zimlib { };