From aa163eb8d8ae80c8d9b46694a99ff55eaec2879c Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:01:13 +0300
Subject: [PATCH 01/50] vala: default.nix -> 0.23.nix & add vala_0_23

---
 pkgs/development/compilers/vala/{default.nix => 0.23.nix} | 0
 pkgs/top-level/all-packages.nix                           | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename pkgs/development/compilers/vala/{default.nix => 0.23.nix} (100%)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/0.23.nix
similarity index 100%
rename from pkgs/development/compilers/vala/default.nix
rename to pkgs/development/compilers/vala/0.23.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fded25cd70f..5714a84a317 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5591,7 +5591,9 @@ in
 
   urweb = callPackage ../development/compilers/urweb { };
 
-  vala = callPackage ../development/compilers/vala/default.nix { };
+  vala = callPackage ../development/compilers/vala/0.23.nix { };
+
+  vala_0_23 = callPackage ../development/compilers/vala/0.23.nix { };
 
   vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { };
 

From 2acfb62caa7fb949348cd736d46a06879b63c997 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:10:06 +0300
Subject: [PATCH 02/50] shotwell: vala -> vala_0_28

---
 pkgs/applications/graphics/shotwell/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                 | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 445cc6aadf5..3f9fd132c09 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
+{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite
 , webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib
 , gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook
 , gnome_doc_utils, hicolor_icon_theme, itstool }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk
+  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk
                   pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
                   which udev libgudev gnome3.gexiv2 hicolor_icon_theme
                   libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5714a84a317..69849c4030f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3453,9 +3453,7 @@ in
 
   sharutils = callPackage ../tools/archivers/sharutils { };
 
-  shotwell = callPackage ../applications/graphics/shotwell {
-    vala = vala_0_28;
-  };
+  shotwell = callPackage ../applications/graphics/shotwell { };
 
   shout = callPackage ../applications/networking/irc/shout { };
 

From 672cf9455d00cce2c487a5e57e7bb2a9e13a3867 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:12:22 +0300
Subject: [PATCH 03/50] valum: vala -> vala_0_28

---
 pkgs/development/web/valum/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 6348008ab92..21881fe6a31 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala, ctpl
+{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala_0_28, ctpl
 , libgee, libsoup, fcgi }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lciwqk4k9sf1hl4drl207g0ydlxl906kx9lx5fqhfb8gwcfqh2g";
   };
 
-  buildInputs = [ python pkgconfig glib vala ctpl libgee libsoup fcgi ];
+  buildInputs = [ python pkgconfig glib vala_0_28 ctpl libgee libsoup fcgi ];
 
   configurePhase = ''python waf configure --prefix=$out'';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69849c4030f..3c158b281e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4039,7 +4039,6 @@ in
 
   valum = callPackage ../development/web/valum {
     inherit (gnome3) libgee;
-    vala = vala_0_28;
   };
 
   varnish = callPackage ../servers/varnish { };

From a57cd70a11a9ca948a3fc10d6366c5dd7b84ad07 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:14:59 +0300
Subject: [PATCH 04/50] pdfpc: vala -> vala_0_26

---
 pkgs/applications/misc/pdfpc/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 7dceaeb8a96..96ad943ad57 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala_0_26, gtk3, libgee
 , poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler
+  buildInputs = [ gstreamer gst-plugins-base vala_0_26 gtk3 libgee poppler
                   libpthreadstubs makeWrapper librsvg ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c158b281e4..a52741ecfe9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14285,7 +14285,6 @@ in
   pdfgrep  = callPackage ../tools/typesetting/pdfgrep { };
 
   pdfpc = callPackage ../applications/misc/pdfpc {
-    vala = vala_0_26;
     inherit (gnome3) libgee;
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };

From 49bd29ae57e35589c3fbccf593ac33aeae8cdbd2 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:16:48 +0300
Subject: [PATCH 05/50] vanubi: vala -> vala_0_26

---
 pkgs/applications/editors/vanubi/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
index de0236a50e8..876bd145b72 100644
--- a/pkgs/applications/editors/vanubi/default.nix
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vala, which, autoconf, automake
+{ stdenv, fetchurl, pkgconfig, vala_0_26, which, autoconf, automake
 , libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
   };
 
-  buildInputs = [ pkgconfig vala which autoconf automake
+  buildInputs = [ pkgconfig vala_0_26 which autoconf automake
                   libtool glib gtk3 libwnck3 asciidoc
                   gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a52741ecfe9..e6d5b90872c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15030,9 +15030,7 @@ in
 
   vanitygen = callPackage ../applications/misc/vanitygen { };
 
-  vanubi = callPackage ../applications/editors/vanubi {
-    vala = vala_0_26;
-  };
+  vanubi = callPackage ../applications/editors/vanubi { };
 
   vbindiff = callPackage ../applications/editors/vbindiff { };
 

From 98b087e413c82d0b6121eaa4fa4dce4957b58b18 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:18:41 +0300
Subject: [PATCH 06/50] font-manager: vala -> vala_0_32

---
 pkgs/applications/misc/font-manager/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                 | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 4269a116085..9dbfa960544 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
   pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
-  vala, gnome3, wrapGAppsHook
+  vala_0_32, gnome3, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     automake autoconf libtool
     file
     intltool
-    vala
+    vala_0_32
     gnome3.yelp_tools
     wrapGAppsHook
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d5b90872c..ff5fb041b0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13038,9 +13038,7 @@ in
 
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
-  font-manager = callPackage ../applications/misc/font-manager {
-    vala = vala_0_32;
-  };
+  font-manager = callPackage ../applications/misc/font-manager { };
 
   foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
 

From 87142605ab9c932595bfc7f69d081957ab138d2d Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:20:34 +0300
Subject: [PATCH 07/50] gmpc: vala -> vala_0_23

---
 pkgs/applications/audio/gmpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 345e98e6989..0c7b5c2c9ca 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
-, gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
+, gtk, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique
 , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
-    libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme
+    libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
     wrapGAppsHook
   ];
 

From 22492ffa3e9aa2caaf354a4035f7850fe7ae807d Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:21:29 +0300
Subject: [PATCH 08/50] giv: vala -> vala_0_23

---
 pkgs/applications/graphics/giv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index f9ea3173b43..1b5ee01d4c0 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib,
-  pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }:
+  pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }:
 
 stdenv.mkDerivation rec {
   name = "giv-20150811-git";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   installPhase = "scons install";
 
-  buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala libtiff
+  buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
     json_glib ];
 
   meta = {

From 402e4882c1b3e363a0a8bfcb0470d4474bc80099 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:22:55 +0300
Subject: [PATCH 09/50] simple-scan: vala -> vala_0_23

---
 pkgs/applications/graphics/simple-scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 0d6ed1f9e72..8af753ac29c 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
-, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook   
+, libusb1, libxml2, pkgconfig, sane-backends, vala_0_23, wrapGAppsHook
 , gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends
-    vala ];
+    vala_0_23 ];
   nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
 
   configureFlags = [ "--disable-packagekit" ];

From 8dad55a70a151ff74d4ac6d00189b533a6a52040 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:23:58 +0300
Subject: [PATCH 10/50] finalterm: vala -> vala_0_23

---
 pkgs/applications/misc/finalterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 9ab9facef5b..9d2f8f4a768 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchgit, makeWrapper
-, pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
+, pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc
 , keybinder3, clutter_gtk, libnotify
 , libxkbcommon, xorg, udev
 , bashInteractive
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee
+    pkgconfig cmake vala_0_23 intltool gtk3 gnome3.gnome_common gnome3.libgee
     gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
     xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
     libxkbcommon

From 214824b99b82e109bb8aa2cfa3e80fc6c6acb060 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:24:49 +0300
Subject: [PATCH 11/50] synapse: vala -> vala_0_23

---
 pkgs/applications/misc/synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 7dce7c7fbcd..21c0c0f5ea3 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json_glib, zeitgeist, vala, hicolor_icon_theme
+, keybinder3, json_glib, zeitgeist, vala_0_23, hicolor_icon_theme
 }:
 
 with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist 
-    vala hicolor_icon_theme
+    vala_0_23 hicolor_icon_theme
   ];
 
   meta = { 

From 64ba21e96685efc52770fe631bfa3e3fe25a375a Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:25:50 +0300
Subject: [PATCH 12/50] midori: vala -> vala_0_23

---
 pkgs/applications/networking/browsers/midori/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 70968b97c3c..a22612993c5 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala, wrapGAppsHook
+{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_23, wrapGAppsHook
 , gtk3, webkitgtk, librsvg, libnotify, sqlite
 , glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3
 , libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    vala
+    vala_0_23
     gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
     libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core
     (libsoup.override {gnomeSupport = true; valaSupport = true;})

From 76119281a55e89fbe145ebe46bb7d83ccef7f815 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:27:12 +0300
Subject: [PATCH 13/50] gnome-boxes: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
index 1edea6b888b..08cfa6c2363 100644
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
+, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
 , desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
 , libusb, libarchive, acl, libgudev, qemu
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     makeWrapper pkgconfig intltool itstool libvirt-glib glib
     gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
-    libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
+    libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
     gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
     librsvg desktop_file_utils acl libgudev numactl xen
   ];

From 0e02f67b7c85ef3c9d0e2fb04e91bf9ec8c9229b Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:28:18 +0300
Subject: [PATCH 14/50] seahorse: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
index 49c48a6b962..e59df06f8a0 100644
--- a/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, vala
+{ stdenv, intltool, fetchurl, vala_0_32
 , pkgconfig, gtk3, glib
 , makeWrapper, itstool, gnupg, libsoup
 , gnome3, librsvg, gdk_pixbuf, gpgme
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
                   gnome3.gsettings_desktop_schemas makeWrapper gnupg
                   gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala gnome3.gcr
+                  libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr
                   openssh ];
 
   preFixup = ''

From b2a7774a0cf48277cd9ef10195dca5a5e9eb26aa Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:29:17 +0300
Subject: [PATCH 15/50] baobab: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/baobab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
index 874c7280949..f7a0ff473cc 100644
--- a/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
+{ stdenv, intltool, fetchurl, vala_0_32, libgtop
 , pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+  buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
                   gnome3.gsettings_desktop_schemas makeWrapper file
                   gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 

From 15a4042a44f20c00ff43ded036b37dfb42ac9a41 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:30:39 +0300
Subject: [PATCH 16/50] dconf-editor: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
index bf39965bf77..6e0184e134e 100644
--- a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
+{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
-  buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
+  buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
                   intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
 
   meta = with stdenv.lib; {

From 9258c49c910c4d443a9550ab5218cee5518744d8 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:31:29 +0300
Subject: [PATCH 17/50] dconf: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/dconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
index 990e2007a23..598d60dd8b7 100644
--- a/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
+{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
 
 let
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2";
   };
 
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+  buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
                   intltool docbook_xsl docbook_xsl_ns makeWrapper ];
 
   meta = with stdenv.lib; {

From 405a97537383a0dc5a89f843e91c1159e367edd0 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:32:29 +0300
Subject: [PATCH 18/50] evolution-data-server: vala -> vala_0_32

---
 .../gnome-3/3.20/core/evolution-data-server/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
index c12b3daa8c9..6b13b726296 100644
--- a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   buildInputs = with gnome3;
     [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
       gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
-    ++ stdenv.lib.optional valaSupport vala;
+    ++ stdenv.lib.optional valaSupport vala_0_32;
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
 

From 3960144641c2f80ef453f1e1f66f628e80510c40 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:33:25 +0300
Subject: [PATCH 19/50] folks: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/folks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix
index 6e200bdb318..5daa33629ff 100644
--- a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
+, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
 , telepathy_glib, evolution_data_server, libsecret, db }:
 
 # TODO: enable more folks backends
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
   # dbus_daemon needed for tests
   buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
-                  vala libsecret libxml2 libsoup nspr nss intltool db ];
+                  vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ];
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = "--disable-fatal-warnings";

From a33d54d385e7c055683624c88445b38a96254d47 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:34:10 +0300
Subject: [PATCH 20/50] gcr: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/gcr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
index e0e8d1e7338..55eebf77be5 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
 , libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
+, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [
     pkgconfig intltool gnupg glib gobjectIntrospection libxslt
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
+    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32
   ];
 
   propagatedBuildInputs = [ p11_kit ];

From 69c78f7c025ebb4f01df225ebfd96cf20fad6efc Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:35:04 +0300
Subject: [PATCH 21/50] gnome-contacts: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
index 6ec3c7871bb..8097cf32ba6 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
@@ -3,7 +3,7 @@
 , libchamplain, clutter_gtk, geocode_glib
 , bash, makeWrapper, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake115x, autoconf }:
+, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libchamplain clutter_gtk geocode_glib
-                  vala automake115x autoconf db ];
+                  vala_0_32 automake115x autoconf db ];
 
   preFixup = ''
     for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do

From ff371cdf2a191181276dc649c41fa5a77abc931e Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:36:11 +0300
Subject: [PATCH 22/50] gnome-terminal: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
index c523d732e03..beb019947ce 100644
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, libuuid, vala
+, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32
 , desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf itstool gnome3.nautilus vala ];
+                  gnome3.dconf itstool gnome3.nautilus vala_0_32 ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2
                         desktop_file_utils wrapGAppsHook ];

From 60ed22ea80de455997816ce8b9e7eb376fee1795 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:36:52 +0300
Subject: [PATCH 23/50] libgee: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/libgee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
index 4ff13295031..0eaa7132e68 100644
--- a/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
 let
   ver_maj = "0.16";
   ver_min = "1";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix_introspection_paths.patch ];
 
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
+  buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
 
   meta = with stdenv.lib; {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";

From 12c49722c9c851e2c5e63f5df0c42fb72c201aa5 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:37:43 +0300
Subject: [PATCH 24/50] libgee-1: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
index 1715e7eeb85..0bfc617fac6 100644
--- a/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
 let
   ver_maj = "0.6";
   ver_min = "8";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix_introspection_paths.patch ];
 
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
+  buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
 
   meta = with stdenv.lib; {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";

From b0d2458922299c87396dc90829b4b3eddf55063d Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:38:36 +0300
Subject: [PATCH 25/50] tracker: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/tracker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
index ead54be84c5..4d84e2980d5 100644
--- a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, libxml2, upower
 , pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, vala, sqlite, libxslt
+, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt
 , gnome3, librsvg, gdk_pixbuf, file, libnotify
 , evolution_data_server, gst_all_1, poppler
 , icu, taglib, libjpeg, libtiff, giflib, libcue
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
+  buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
                   bzip2 gnome3.totem-pl-parser libxslt
                   gnome3.gsettings_desktop_schemas makeWrapper file
                   gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite

From be40f3236f5e0c17a9381ab3cc2e60b6a0e8f309 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:39:26 +0300
Subject: [PATCH 26/50] vte: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/core/vte/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix
index 6b7eb804008..80699e21289 100644
--- a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig
-, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls
+, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls
 
 , selectTextPatch ? false
 , fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf
@@ -9,7 +9,7 @@ let baseAttrs = rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
-                  gnome3.gtk3 ncurses vala libxml2 ];
+                  gnome3.gtk3 ncurses vala_0_32 libxml2 ];
 
   propagatedBuildInputs = [ gnutls ];
 

From b41fda2ab0cdfef24947ecbf956b1777bb53c3fd Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:47:53 +0300
Subject: [PATCH 27/50] california: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/misc/california/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/misc/california/default.nix b/pkgs/desktops/gnome-3/3.20/misc/california/default.nix
index 4bdeeb23a91..ca0450dc7f9 100644
--- a/pkgs/desktops/gnome-3/3.20/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/misc/california/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper
 , gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
 
 let
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee
+  buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee
     libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
     sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
 

From 1da4a65fc4e2abbcb720f1a9e0074b05c6085ed1 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:48:35 +0300
Subject: [PATCH 28/50] geary: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/misc/geary/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
index 40c8bbf5ef9..a2c644caf3c 100644
--- a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32
 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
 , libnotify, libcanberra, libsecret, gmime
 , libpthreadstubs, sqlite
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
-                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
+                  vala_0_32 webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
                   libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
                   gdk_pixbuf librsvg gnome3.defaultIconTheme ];
 

From 7d210a49ad723542baeb154d121ed66a67005fce Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:49:15 +0300
Subject: [PATCH 29/50] gitg: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
index d7ac9a24c4c..ffd5a279e73 100644
--- a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
+{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib
 , json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
 , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ shared_mime_info
                             gnome3.gnome_themes_standard ];
 
-  buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
+  buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
                   libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
                   librsvg libsecret
                   gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ];

From 16e9360a061a2e99228e2aa1ed4dd97dc4d2968b Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:51:34 +0300
Subject: [PATCH 30/50] gpaste: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
index 5b9f1638400..2550c7e42e6 100644
--- a/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
+{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
   };
 
-  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
+  buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
                   gtk3 gnome3.gnome_control_center dbus
                   clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
 

From 168d8c6b1bd6c0753a5dbaaac74fadbfc9445918 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:51:55 +0300
Subject: [PATCH 31/50] libgit2-glib: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
index d7e89702795..6915ede4ad5 100644
--- a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2
 , gtk_doc, gobjectIntrospection, libgit2, glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala libssh2
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2
                   gtk_doc gobjectIntrospection libgit2 glib ];
 
   meta = with stdenv.lib; {

From c5204e5374f656bd4edd0f8bd79234a05547ef43 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 19:53:26 +0300
Subject: [PATCH 32/50] pomodoro: vala -> vala_0_32

---
 pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix
index 880e0c52c1a..ff176754e38 100644
--- a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
+  dbus_glib, libcanberra, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base,
   glib, gobjectIntrospection, telepathy_glib
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
+    makeWrapper dbus_glib libcanberra vala_0_32 gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
     gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib

From 2a6a324c8be12ca2a4c2b27c6429fde1b582dc20 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:04:55 +0300
Subject: [PATCH 33/50] pantheon-terminal: vala -> vala_0_23

---
 pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index bb04df6134d..d91f06e0c3a 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
+{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
   majorVersion = "0.3";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = with gnome3; [
-    perl cmake vala pkgconfig glib gtk3 granite libnotify gettext makeWrapper
+    perl cmake vala_0_23 pkgconfig glib gtk3 granite libnotify gettext makeWrapper
     vte_290 libgee gsettings_desktop_schemas defaultIconTheme
   ];
   meta = {

From efaa6d116c4fb10127670668d4c3217e9c0cf21c Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:06:29 +0300
Subject: [PATCH 34/50] granite: vala -> vala_0_23

---
 pkgs/development/libraries/granite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 5a2ff5daa11..4d011ddd463 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
+{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
 
 stdenv.mkDerivation rec {
   majorVersion = "0.3";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz";
   };
   cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0";
-  buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext];
+  buildInputs = [perl cmake vala_0_23 pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext];
   meta = {
     description = "An extension to GTK+ used by elementary OS";
     longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS.";

From 7e226b02c595a301cd60b132b60c1eebb0d4190e Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:07:11 +0300
Subject: [PATCH 35/50] gusb: vala -> vala_0_23

---
 pkgs/development/libraries/gusb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index c33920953ce..ac0425b54ad 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl
 , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
-, glib, systemd, libusb1, vala
+, glib, systemd, libusb1, vala_0_23
 }:
 stdenv.mkDerivation rec {
   name = "gusb-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt
-    systemd libusb1 vala
+    systemd libusb1 vala_0_23
     glib
   ];
 

From ef4f13a068cfec9b1cc48c6d66e726838b2b4237 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:07:58 +0300
Subject: [PATCH 36/50] libappindicator: vala -> vala_0_23

---
 pkgs/development/libraries/libappindicator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 0dac5e4766f..4cf0c52d88b 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -5,7 +5,7 @@
 , glib, dbus_glib, gtkVersion
 , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
 , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
-, python, pygobject, pygtk, gobjectIntrospection, vala
+, python, pygobject, pygtk, gobjectIntrospection, vala_0_23
 , monoSupport ? false, mono ? null, gtk-sharp ? null
  }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib dbus_glib
-    python pygobject pygtk gobjectIntrospection vala
+    python pygobject pygtk gobjectIntrospection vala_0_23
   ] ++ (if gtkVersion == "2"
     then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ]
     else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]);

From df9922e4b54fa2c4019a89eb241eace41f018996 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:08:42 +0300
Subject: [PATCH 37/50] libdbusmenu: vala -> vala_0_23

---
 pkgs/development/libraries/libdbusmenu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix
index 3e633f9a365..90880fd4d52 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/pkgs/development/libraries/libdbusmenu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, file
 , pkgconfig, intltool
 , glib, dbus_glib, json_glib
-, gobjectIntrospection, vala, gnome_doc_utils
+, gobjectIntrospection, vala_0_23, gnome_doc_utils
 , gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
 
 with lib;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib dbus_glib json_glib
-    gobjectIntrospection vala gnome_doc_utils
+    gobjectIntrospection vala_0_23 gnome_doc_utils
   ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
 
   postPatch = ''

From a94a98724800c926c7459a55eee8b3fc3796f11f Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:09:21 +0300
Subject: [PATCH 38/50] libfm: vala -> vala_0_23

---
 pkgs/development/libraries/libfm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index db17b46b0d3..f4f3c774789 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala
+{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala_0_23
 , extraOnly ? false }:
 let
     inherit (stdenv.lib) optional;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q";
   };
 
-  buildInputs = [ glib gtk intltool pango pkgconfig vala ]
+  buildInputs = [ glib gtk intltool pango pkgconfig vala_0_23 ]
                 ++ optional (!extraOnly) menu-cache;
 
   configureFlags = optional extraOnly "--with-extra-only";

From 83b302e134be55a1869dab0911bd02d04c8a45ee Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:10:06 +0300
Subject: [PATCH 39/50] libindicate: vala -> vala_0_23

---
 pkgs/development/libraries/libindicate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 0cff4aa1913..514aea12c7e 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -4,7 +4,7 @@
 , pkgconfig, autoconf
 , glib, dbus_glib, libdbusmenu-glib
 , gtkVersion, gtk2 ? null, gtk3 ? null
-, python, pygobject, pygtk, gobjectIntrospection, vala, gnome_doc_utils
+, python, pygobject, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils
 , monoSupport ? false, mono ? null, gtk-sharp ? null
  }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib dbus_glib libdbusmenu-glib
-    python pygobject pygtk gobjectIntrospection vala gnome_doc_utils
+    python pygobject pygtk gobjectIntrospection vala_0_23 gnome_doc_utils
   ] ++ (if gtkVersion == "2"
     then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ]
     else [ gtk3 ]);

From 4ce4a798ea8a32f024de5a2c4b76b55f3d090b7e Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:10:54 +0300
Subject: [PATCH 40/50] libosinfo: vala -> vala_0_23

---
 pkgs/development/libraries/libosinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 83873cc3660..b0b22aa18e7 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup
-, libxslt, check, vala ? null
+, libxslt, check, vala_0_23 ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig intltool gobjectIntrospection libsoup libxslt check vala
+    pkgconfig intltool gobjectIntrospection libsoup libxslt check vala_0_23
   ];
 
   meta = with stdenv.lib; {

From a206e13fe1beb13288d4eb55bbe993f6f1d4a569 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:11:51 +0300
Subject: [PATCH 41/50] libsoup: vala -> vala_0_23

---
 pkgs/development/libraries/libsoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 785e3320cc1..05026a06c61 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
 , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
-, valaSupport ? true, vala
+, valaSupport ? true, vala_0_23
 , libintlOrEmpty
 , intltool, python }:
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   outputs = [ "dev" "out" ];
 
   buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
-    ++ stdenv.lib.optionals valaSupport [ vala ];
+    ++ stdenv.lib.optionals valaSupport [ vala_0_23 ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];

From fe86c247309058a6860d6e231224d1d33f9cabf2 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:12:32 +0300
Subject: [PATCH 42/50] libunity: vala -> vala_0_23

---
 pkgs/development/libraries/libunity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index 94e19f97e80..bcbe15afdf8 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala, python, intltool, pkgconfig
+{ stdenv, fetchurl, vala_0_23, python, intltool, pkgconfig
 , glib, libgee_0_6, gtk3, dee, libdbusmenu-glib
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib libgee_0_6 gtk3 ];
   propagatedBuildInputs = [ dee libdbusmenu-glib ];
-  nativeBuildInputs = [ vala python intltool pkgconfig ];
+  nativeBuildInputs = [ vala_0_23 python intltool pkgconfig ];
 
   enableParallelBuilding = true;
 

From 18bca23878d1097bc8d3c93ea2961161ec71b83b Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:13:36 +0300
Subject: [PATCH 43/50] telepathy: vala -> vala_0_23

---
 pkgs/development/libraries/telepathy/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 69d833064ed..e9c9260d8d8 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt
-, gobjectIntrospection, valaSupport ? true, vala }:
+, gobjectIntrospection, valaSupport ? true, vala_0_23 }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.24.1";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection];
 
-  buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala;
+  buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala_0_23;
 
   preConfigure = ''
     substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires

From 1457159889b55ba7bd23a55be29ac7421fbf38b4 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:14:27 +0300
Subject: [PATCH 44/50] zeitgeist: vala -> vala_0_23

---
 pkgs/development/libraries/zeitgeist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index ced0844f3e1..879e1ccaec3 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala
+{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23
 , intltool, libtool, python, dbus_libs, telepathy_glib
 , gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
 
   buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool
-                  libtool python dbus_libs telepathy_glib vala dbus_glib
+                  libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib
                   gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ];
 
   prePatch = "patchShebangs .";

From 5b047ac9b5dd49219d9cba295df8c62c7d022094 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:15:14 +0300
Subject: [PATCH 45/50] seafile-shared: vala -> vala_0_23

---
 pkgs/misc/seafile-shared/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 16464ab27e3..4404d5d6fec 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala, python, intltool, fuse, ccnet}:
+{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala_0_23, python, intltool, fuse, ccnet}:
 
 stdenv.mkDerivation rec
 {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec
     sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670";
   };
 
-  buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
+  buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ];
   propagatedBuildInputs = [ ccnet curl ];
 
   preConfigure = ''

From 363fac7da7c52369e62a7ed4f72cac873448bdeb Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:17:14 +0300
Subject: [PATCH 46/50] gtk-vnc: vala -> vala_0_23

---
 pkgs/tools/admin/gtk-vnc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 657d08026e4..9ef9755d6bc 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gobjectIntrospection
 , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
-, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
+, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala_0_23
 , pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     python gnutls cairo libtool pkgconfig glib libffi libgcrypt
     intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
     gobjectIntrospection libogg libgpgerror
-  ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);
+  ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk pygtk pygobject ]);
 
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   configureFlags = [

From a0ff1c782414daff6f5ff53b93af39e9d7145f4a Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:17:25 +0300
Subject: [PATCH 47/50] ccnet: vala -> vala_0_23

---
 pkgs/tools/networking/ccnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index d7aaa0f77fc..bab8cbc8639 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
+{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala_0_23, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
 
 stdenv.mkDerivation rec
 {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec
     sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1";
   };
 
-  buildInputs = [ which automake autoconf pkgconfig libtool vala  python ];
+  buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ];
   propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
 
   preConfigure = ''

From 1730151d97044f6bb68097076054829c2f40297e Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:18:21 +0300
Subject: [PATCH 48/50] packagekit: vala -> vala_0_23

---
 pkgs/tools/package-management/packagekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 43f025fafa4..af8a162357b 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, lib
 , intltool, glib, pkgconfig, polkit, python, sqlite, systemd
-, gobjectIntrospection, vala, gtk_doc, autoreconfHook, autoconf-archive
+, gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive
 , nix, boost
 , enableCommandNotFound ? false
 , enableBashCompletion ? false, bashCompletion ? null }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6";
   };
 
-  buildInputs = [ glib polkit systemd python gobjectIntrospection vala ]
+  buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ]
                   ++ lib.optional enableBashCompletion bashCompletion;
   propagatedBuildInputs = [ sqlite nix boost ];
   nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

From 7d393440df766ab7ec5adc317cdbb931d2b14675 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:18:54 +0300
Subject: [PATCH 49/50] gencfsm: vala -> vala_0_23

---
 pkgs/tools/security/gencfsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index fb903003620..8441fbbb761 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
-, glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg }:
+, glib , gnome3, gtk3, libgnome_keyring, vala_0_23, wrapGAppsHook, xorg }:
 
 stdenv.mkDerivation rec {
   version = "1.8.16";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "06sz6zcmvxkqww5gx4brcqs4hlpy9d8sal9nmw0pdsvh8k5vmpgn";
   };
 
-  buildInputs = [ autoconf automake intltool libtool pkgconfig vala glib encfs
+  buildInputs = [ autoconf automake intltool libtool pkgconfig vala_0_23 glib encfs
     gtk3 libgnome_keyring gnome3.libgee_1 xorg.libSM xorg.libICE
     wrapGAppsHook ];
 

From cfe27ddf90d60349eb4abd82ccea7b20f6bf1540 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 21 Aug 2016 20:21:53 +0300
Subject: [PATCH 50/50] vala: remove default vala namespace

---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff5fb041b0c..a1f63a5de2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5588,8 +5588,6 @@ in
 
   urweb = callPackage ../development/compilers/urweb { };
 
-  vala = callPackage ../development/compilers/vala/0.23.nix { };
-
   vala_0_23 = callPackage ../development/compilers/vala/0.23.nix { };
 
   vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { };