Merge pull request #125722 from AndersonTorres/new-zig
zig: 0.7.1 -> 0.8.0
This commit is contained in:
commit
3255d05cac
@ -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
|
||||
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user