diff options
| author | Will Dietz <github@wdtz.org> | 2018-03-20 12:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 12:43:27 -0500 |
| commit | d5797472e25ec65d8e8120614c28dce647302add (patch) | |
| tree | 265de17d996bd0a7c568bceab647199679f80ccc /pkgs | |
| parent | ab42a7595a4ef3dcce99e79bef40cf0b8e335ac0 (diff) | |
| parent | dc3b791854589d7c1c6d210f070a1e82315798f6 (diff) | |
| download | nixpkgs-d5797472e25ec65d8e8120614c28dce647302add.tar nixpkgs-d5797472e25ec65d8e8120614c28dce647302add.tar.gz nixpkgs-d5797472e25ec65d8e8120614c28dce647302add.tar.bz2 nixpkgs-d5797472e25ec65d8e8120614c28dce647302add.tar.lz nixpkgs-d5797472e25ec65d8e8120614c28dce647302add.tar.xz nixpkgs-d5797472e25ec65d8e8120614c28dce647302add.tar.zst nixpkgs-d5797472e25ec65d8e8120614c28dce647302add.zip | |
Merge pull request #37352 from andrewrk/zig-0.2.0
zig: 0.1.1 -> 0.2.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/zig/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index cffc683f9e7..44d1f7bfe4a 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: stdenv.mkDerivation rec { - version = "0.1.1"; + version = "0.2.0"; name = "zig-${version}"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig"; rev = "${version}"; - sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; }; - buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; cmakeFlags = [ "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; - homepage = http://ziglang.org/; + homepage = https://ziglang.org/; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54e2bc796a9..71a86853651 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11881,7 +11881,9 @@ with pkgs; czmq = czmq3; }; - zig = callPackage ../development/compilers/zig {}; + zig = callPackage ../development/compilers/zig { + llvmPackages = llvmPackages_6; + }; zimlib = callPackage ../development/libraries/zimlib { }; |