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

vala: 0.36, 0.38 and 0.40 point upgrades

Browse Source
This commit is contained in:
Peter Hoeg 2018-05-21 17:13:14 +08:00
parent a48088769f
commit 9689754805
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/compilers/vala/default.nix
View File

@ -1,10 +1,12 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz { stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz
, glib, libiconv, libintl, libtool, expat , glib, libiconv, libintl, libtool, expat
}: }:
let let
generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }: generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }:
stdenv.mkDerivation rec { let
atLeast = lib.versionAtLeast "${major}.${minor}";
in stdenv.mkDerivation rec {
name = "vala-${major}.${minor}"; name = "vala-${major}.${minor}";
src = fetchurl { src = fetchurl {
@ -14,9 +16,15 @@ let
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; nativeBuildInputs = [
pkgconfig flex bison libxslt
] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat
++ extraNativeBuildInputs;
buildInputs = [ glib libiconv libintl ] ++ extraBuildInputs; buildInputs = [
glib libiconv libintl
] ++ lib.optional (atLeast "0.38") graphviz
++ extraBuildInputs;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Compiler for GObject type system"; description = "Compiler for GObject type system";
@ -61,24 +69,21 @@ in rec {
vala_0_36 = generic { vala_0_36 = generic {
major = "0.36"; major = "0.36";
minor = "12"; minor = "13";
sha256 = "1nvw721piwdh15bipg0sdll9kvgpz0y9i5fpszlc7y9w64yis25l"; sha256 = "0gxz7yisd9vh5d2889p60knaifz5zndgj98zkdfkkaykdfdq4m9k";
}; };
vala_0_38 = generic { vala_0_38 = generic {
major = "0.38"; major = "0.38";
minor = "4"; minor = "9";
sha256 = "1sg5gaq3jhgr9vzh2ypiw475167k150wmyglymr7wwqppmikmcrc"; sha256 = "1dh1qacfsc1nr6hxwhn9lqmhnq39rv8gxbapdmj1v65zs96j3fn3";
extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ]; extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
extraBuildInputs = [ graphviz ];
}; };
vala_0_40 = generic { vala_0_40 = generic {
major = "0.40"; major = "0.40";
minor = "0"; minor = "6";
sha256 = "0wcfljl55a9qvslfcc4sf76wdpwgn83n96b7fgb7r49ib35qz20m"; sha256 = "1qjbwhifwwqbdg5zilvnwm4n76g8p7jwqs3fa0biw3rylzqm193d";
extraNativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ expat ];
extraBuildInputs = [ graphviz ];
}; };
vala = vala_0_38; vala = vala_0_38;