From 86c0ca9cc24d469fd32f152eac9c208e64345b10 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 30 Apr 2019 18:17:22 -0400 Subject: [PATCH 1/6] vala_0_36: 0.36.18 -> 0.36.19 https://gitlab.gnome.org/GNOME/vala/raw/0.36/NEWS --- pkgs/development/compilers/vala/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index dfd40c92ecfa..a8c74f256ffb 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -102,9 +102,9 @@ let in rec { vala_0_36 = generic { - major = "0.36"; - minor = "18"; - sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9"; + major = "0.36"; + minor = "19"; + sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar"; }; vala_0_38 = generic { From 40dd4f5f9e7503d52aabbaff9b5dbe6960e8b50d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 30 Apr 2019 18:19:54 -0400 Subject: [PATCH 2/6] vala_0_40: 0.40.14 -> 0.40.15 https://gitlab.gnome.org/GNOME/vala/raw/0.40/NEWS --- pkgs/development/compilers/vala/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index a8c74f256ffb..4d0e07117cfe 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -115,9 +115,9 @@ in rec { }; vala_0_40 = generic { - major = "0.40"; - minor = "14"; - sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0"; + major = "0.40"; + minor = "15"; + sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19"; }; vala_0_42 = generic { From fc508b7869ddfe4964e8f693640bbd8f64cf53f9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 30 Apr 2019 18:21:12 -0400 Subject: [PATCH 3/6] vala_0_42: 0.42.6 -> 0.42.7 https://gitlab.gnome.org/GNOME/vala/raw/0.42/NEWS --- pkgs/development/compilers/vala/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 4d0e07117cfe..110d60f300f7 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -121,9 +121,9 @@ in rec { }; vala_0_42 = generic { - major = "0.42"; - minor = "6"; - sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p"; + major = "0.42"; + minor = "7"; + sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83"; }; vala_0_44 = generic { From d7e35ec3418f24a000f8595e613a48cef1591b57 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 30 Apr 2019 18:23:16 -0400 Subject: [PATCH 4/6] vala_0_44: 0.44.1 -> 0.44.3 https://gitlab.gnome.org/GNOME/vala/raw/0.44/NEWS --- pkgs/development/compilers/vala/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 110d60f300f7..81fa8d23f488 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -127,9 +127,9 @@ in rec { }; vala_0_44 = generic { - major = "0.44"; - minor = "1"; - sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n"; + major = "0.44"; + minor = "3"; + sha256 = "1sgas7z6y9r2mf4pxry3fx2awdnzn3vlg2sxd3hqpy2a90ib8lw5"; }; vala = vala_0_44; From 2148e70a8bc2309da2c538767a7b1b2685b45411 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 30 Apr 2019 18:34:09 -0400 Subject: [PATCH 5/6] vala: no vertical align --- pkgs/development/compilers/vala/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 81fa8d23f488..cdbdcda91878 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -108,9 +108,9 @@ in rec { }; vala_0_38 = generic { - major = "0.38"; - minor = "10"; - sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw"; + major = "0.38"; + minor = "10"; + sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw"; extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool; }; From cbb80342f79aadd04dc672541bb29f61889a1145 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Thu, 25 Apr 2019 20:15:59 +0200 Subject: [PATCH 6/6] vala: Prepare for updateScript 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 --- pkgs/development/compilers/vala/default.nix | 45 +++++++++++---------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index cdbdcda91878..5fb376ef66ec 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -4,14 +4,12 @@ let generic = lib.makeOverridable ({ - major, minor, sha256, + version, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [], withGraphviz ? false }: let - atLeast = lib.versionAtLeast "${major}.${minor}"; - # Patches from the openembedded-core project to build vala without graphviz # 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) @@ -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.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 { - name = "vala-${version}"; - version = "${major}.${minor}"; + pname = "vala"; + inherit version; setupHook = substituteAll { src = ./setup-hook.sh; - apiVersion = major; + apiVersion = lib.versions.majorMinor version; }; 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; }; @@ -78,19 +76,27 @@ let nativeBuildInputs = [ 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 ++ extraNativeBuildInputs; buildInputs = [ glib libiconv libintl - ] ++ lib.optional (atLeast "0.38" && withGraphviz) graphviz + ] ++ lib.optional (lib.versionAtLeast version "0.38" && withGraphviz) graphviz ++ extraBuildInputs; enableParallelBuilding = true; 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; { description = "Compiler for GObject type system"; homepage = https://wiki.gnome.org/Projects/Vala; @@ -102,33 +108,28 @@ let in rec { vala_0_36 = generic { - major = "0.36"; - minor = "19"; + version = "0.36.19"; sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar"; }; vala_0_38 = generic { - major = "0.38"; - minor = "10"; - sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw"; + version = "0.38.10"; + sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw"; extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool; }; vala_0_40 = generic { - major = "0.40"; - minor = "15"; + version = "0.40.15"; sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19"; }; vala_0_42 = generic { - major = "0.42"; - minor = "7"; + version = "0.42.7"; sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83"; }; vala_0_44 = generic { - major = "0.44"; - minor = "3"; + version = "0.44.3"; sha256 = "1sgas7z6y9r2mf4pxry3fx2awdnzn3vlg2sxd3hqpy2a90ib8lw5"; };