diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:16:36 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:17:42 +0200 |
commit | ef41fc7f5140a6d980faf7ed2a865ec2f092253b (patch) | |
tree | 81bcfcc47155b56618dd73934ba41d8d8c7fc309 /pkgs/development/compilers | |
parent | 656a0089f68495cd42d3164ed85d22ceec630d82 (diff) | |
parent | 893df17c5a37e14616a24e66d96f3fd5e0344bce (diff) | |
download | nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.gz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.bz2 nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.lz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.xz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.zst nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.zip |
Merge branch 'master' into staging
Hydra: ?compare=1399476
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/llvm/4/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/opa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/vala/default.nix | 18 |
3 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index c1d1ce055d76..25bb008567f7 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -10,7 +10,7 @@ let version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; + url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 9501b5a3a06e..7b9e00b105db 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ which perl jdk openssl coreutils zlib ncurses makeWrapper gcc binutils gnumake nodejs ] ++ (with ocamlPackages; [ - ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4 + ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4 ]); NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 42b81a21a671..baf48d7a532c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz +, glib, libiconv, libintlOrEmpty, libtool, expat }: let - generic = { major, minor, sha256 }: + generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }: stdenv.mkDerivation rec { name = "vala-${major}.${minor}"; @@ -12,9 +12,9 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; - buildInputs = [ glib libiconv ] ++ libintlOrEmpty; + buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; meta = with stdenv.lib; { description = "Compiler for GObject type system"; @@ -57,5 +57,13 @@ in rec { sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; }; + vala_0_38 = generic { + major = "0.38"; + minor = "1"; + sha256 = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h"; + extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ]; + extraBuildInputs = [ graphviz ]; + }; + vala = vala_0_34; } |