JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107535 from miikka/upgrade-zig-0.7.1

Browse Source 
zig: 0.6.0 -> 0.7.1
This commit is contained in:
Sandro 2020-12-25 04:13:54 +01:00 committed by GitHub
commit f0317814f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/zig/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }:
llvmPackages.stdenv.mkDerivation rec { llvmPackages.stdenv.mkDerivation rec {
version = "0.6.0"; version = "0.7.1";
pname = "zig"; pname = "zig";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ziglang"; owner = "ziglang";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z"; sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
./zig test $src/test/stage1/behavior.zig ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/stage1/behavior.zig
runHook postCheck runHook postCheck
''; '';

2
pkgs/top-level/all-packages.nix
View File

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