Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

zig: 0.1.1 -> 0.2.0

(cherry picked from commit dc3b791854589d7c1c6d210f070a1e82315798f6)

authored by Andrew Kelley and committed by Will Dietz 77c052d9 fa78cd4d

+9 -6
+6 -5
pkgs/development/compilers/zig/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, llvmPackages }: 1 + { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "0.1.1"; 4 + version = "0.2.0"; 5 5 name = "zig-${version}"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "zig-lang"; 9 9 repo = "zig"; 10 10 rev = "${version}"; 11 - sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; 11 + sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; 12 12 }; 13 13 14 - buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ]; 14 + nativeBuildInputs = [ cmake ]; 15 + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; 15 16 16 17 cmakeFlags = [ 17 18 "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" ··· 26 27 27 28 meta = with stdenv.lib; { 28 29 description = "Programming languaged designed for robustness, optimality, and clarity"; 29 - homepage = http://ziglang.org/; 30 + homepage = https://ziglang.org/; 30 31 license = licenses.mit; 31 32 platforms = platforms.unix; 32 33 maintainers = [ maintainers.andrewrk ];
+3 -1
pkgs/top-level/all-packages.nix
··· 11877 11877 czmq = czmq3; 11878 11878 }; 11879 11879 11880 - zig = callPackage ../development/compilers/zig {}; 11880 + zig = callPackage ../development/compilers/zig { 11881 + llvmPackages = llvmPackages_6; 11882 + }; 11881 11883 11882 11884 zimlib = callPackage ../development/libraries/zimlib { }; 11883 11885