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

vala: Prepare for updateScript

Browse Source 
It doesn't have to be that complicated with the major and minor versions
being split. We have library functions that handle it fine.

passthru.upateScript can be enabled once #59372 is merged
This commit is contained in:
Daniel Schaefer 2019-04-25 20:15:59 +02:00 committed by worldofpeace
parent 2148e70a8b
commit cbb80342f7
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
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,33 +108,28 @@ let
in rec { in rec {
vala_0_36 = generic { vala_0_36 = generic {
major = "0.36"; version = "0.36.19";
minor = "19";
sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar"; sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar";
}; };
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 = "15";
sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19"; sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19";
}; };
vala_0_42 = generic { vala_0_42 = generic {
major = "0.42"; version = "0.42.7";
minor = "7";
sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83"; sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83";
}; };
vala_0_44 = generic { vala_0_44 = generic {
major = "0.44"; version = "0.44.3";
minor = "3";
sha256 = "1sgas7z6y9r2mf4pxry3fx2awdnzn3vlg2sxd3hqpy2a90ib8lw5"; sha256 = "1sgas7z6y9r2mf4pxry3fx2awdnzn3vlg2sxd3hqpy2a90ib8lw5";
}; };