Merge pull request #125722 from AndersonTorres/new-zig

zig: 0.7.1 -> 0.8.0
This commit is contained in:
Anderson Torres 2021-06-04 20:09:29 -03:00 committed by GitHub
commit 3255d05cac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions

View File

@ -1,5 +1,4 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, llvmPackages
@ -7,19 +6,23 @@
, zlib
}:
llvmPackages.stdenv.mkDerivation rec {
let
inherit (llvmPackages) stdenv;
in
stdenv.mkDerivation rec {
pname = "zig";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "ziglang";
repo = pname;
rev = version;
hash = "sha256-rZYv8LFH3M70SyPwPVyul+Um9j82K8GZIepVmaonzPw=";
hash = "sha256-bILjcKX8jPl2n1HRYvYRb7jJkobwqmSJ+hHXSn9n2ag=";
};
nativeBuildInputs = [
cmake llvmPackages.llvm.dev
cmake
llvmPackages.llvm.dev
];
buildInputs = [
libxml2
@ -34,14 +37,6 @@ llvmPackages.stdenv.mkDerivation rec {
export HOME=$TMPDIR;
'';
checkPhase = ''
runHook preCheck
./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/stage1/behavior.zig
runHook postCheck
'';
doCheck = true;
meta = with lib; {
homepage = "https://ziglang.org/";
description =
@ -53,3 +48,4 @@ llvmPackages.stdenv.mkDerivation rec {
broken = stdenv.isDarwin;
};
}
# TODO: checkPhase

View File

@ -18653,7 +18653,7 @@ in
libzra = callPackage ../development/libraries/libzra { };
zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_11;
llvmPackages = llvmPackages_12;
};
zimlib = callPackage ../development/libraries/zimlib { };