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

Merge pull request #60548 from worldofpeace/vala-updates/04-30-19

Browse Source 
vala updates
This commit is contained in:
worldofpeace 2019-04-30 21:55:59 -04:00 committed by GitHub
commit 018e5ff1be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,14 +4,12 @@
let let
generic = lib.makeOverridable ({ generic = lib.makeOverridable ({
major, minor, sha256, version, sha256,
extraNativeBuildInputs ? [], extraNativeBuildInputs ? [],
extraBuildInputs ? [], extraBuildInputs ? [],
withGraphviz ? false withGraphviz ? false
}: }:
let let
atLeast = lib.versionAtLeast "${major}.${minor}";
# Patches from the openembedded-core project to build vala without graphviz # Patches from the openembedded-core project to build vala without graphviz
# support. We need to apply an additional patch to allow building when the # support. We need to apply an additional patch to allow building when the
# header file isn't available at all, but that patch (./gvc-compat.patch) # header file isn't available at all, but that patch (./gvc-compat.patch)
@ -45,21 +43,21 @@ let
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.44" = ./disable-graphviz-0.44.1.patch; "0.44" = ./disable-graphviz-0.44.1.patch;
}.${major} or (throw "no graphviz patch for this version of vala"); }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
disableGraphviz = atLeast "0.38" && !withGraphviz; disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "vala-${version}"; pname = "vala";
version = "${major}.${minor}"; inherit version;
setupHook = substituteAll { setupHook = substituteAll {
src = ./setup-hook.sh; src = ./setup-hook.sh;
apiVersion = major; apiVersion = lib.versions.majorMinor version;
}; };
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
inherit sha256; inherit sha256;
}; };
@ -78,19 +76,27 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig flex bison libxslt pkgconfig flex bison libxslt
] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat ] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat
++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
++ extraNativeBuildInputs; ++ extraNativeBuildInputs;
buildInputs = [ buildInputs = [
glib libiconv libintl glib libiconv libintl
] ++ lib.optional (atLeast "0.38" && withGraphviz) graphviz ] ++ lib.optional (lib.versionAtLeast version "0.38" && withGraphviz) graphviz
++ extraBuildInputs; ++ extraBuildInputs;
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; # fails, requires dbus daemon doCheck = false; # fails, requires dbus daemon
# Wait for PR #59372
#passthru = {
# updateScript = gnome3.updateScript {
# attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}";
# packageName = pname;
# };
#};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Compiler for GObject type system"; description = "Compiler for GObject type system";
homepage = https://wiki.gnome.org/Projects/Vala; homepage = https://wiki.gnome.org/Projects/Vala;
@ -102,34 +108,29 @@ let
in rec { in rec {
vala_0_36 = generic { vala_0_36 = generic {
major = "0.36"; version = "0.36.19";
minor = "18"; sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar";
sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9";
}; };
vala_0_38 = generic { vala_0_38 = generic {
major = "0.38"; version = "0.38.10";
minor = "10";
sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw"; sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw";
extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool; extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
}; };
vala_0_40 = generic { vala_0_40 = generic {
major = "0.40"; version = "0.40.15";
minor = "14"; sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19";
sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0";
}; };
vala_0_42 = generic { vala_0_42 = generic {
major = "0.42"; version = "0.42.7";
minor = "6"; sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83";
sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p";
}; };
vala_0_44 = generic { vala_0_44 = generic {
major = "0.44"; version = "0.44.3";
minor = "1"; sha256 = "1sgas7z6y9r2mf4pxry3fx2awdnzn3vlg2sxd3hqpy2a90ib8lw5";
sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n";
}; };
vala = vala_0_44; vala = vala_0_44;