From 58738223ab0de7c8df5091f38b01161c194b3b9a Mon Sep 17 00:00:00 2001
From: Antono Vasiljev <self@antono.info>
Date: Mon, 25 Jun 2012 19:01:51 +0300
Subject: [PATCH] Rm vala 14 add versions

---
 pkgs/development/compilers/vala/14.2.nix    | 22 ---------------------
 pkgs/development/compilers/vala/15.2.nix    |  6 ++++--
 pkgs/development/compilers/vala/16.1.nix    |  6 ++++--
 pkgs/development/compilers/vala/default.nix |  6 ++++--
 pkgs/top-level/all-packages.nix             |  4 ++--
 5 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/compilers/vala/14.2.nix

diff --git a/pkgs/development/compilers/vala/14.2.nix b/pkgs/development/compilers/vala/14.2.nix
deleted file mode 100644
index ffdf7b1aeb8..00000000000
--- a/pkgs/development/compilers/vala/14.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
-
-stdenv.mkDerivation rec {
-  name = "vala-0.14.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz;
-    sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0";
-  };
-
-  buildNativeInputs = [ yacc flex pkgconfig xz ];
-
-  buildInputs = [ glib ];
-
-  meta = {
-    description = "Compiler for the GObject type system";
-    homepage = "http://live.gnome.org/Vala";
-    license = "free-copyleft";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.antono ];
-  };
-}
diff --git a/pkgs/development/compilers/vala/15.2.nix b/pkgs/development/compilers/vala/15.2.nix
index 55c61c3b321..822102b7bd4 100644
--- a/pkgs/development/compilers/vala/15.2.nix
+++ b/pkgs/development/compilers/vala/15.2.nix
@@ -1,10 +1,12 @@
 {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
 
 stdenv.mkDerivation rec {
-  name = "vala-0.15.2";
+
+  version = "0.15.2";
+  name = "vala-${version}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/vala/0.15/vala-0.15.2.tar.xz;
+    url = "mirror://gnome/sources/vala/0.15/${name}.tar.xz";
     sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w";
   };
 
diff --git a/pkgs/development/compilers/vala/16.1.nix b/pkgs/development/compilers/vala/16.1.nix
index 70422798075..54e6af8798d 100644
--- a/pkgs/development/compilers/vala/16.1.nix
+++ b/pkgs/development/compilers/vala/16.1.nix
@@ -1,10 +1,12 @@
 {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
 
 stdenv.mkDerivation rec {
-  name = "vala-0.16.1";
+
+  version = "0.16.1";
+  name = "vala-${version}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/vala/0.16/vala-0.16.1.tar.xz;
+    url = "mirror://gnome/sources/vala/0.16/${name}.tar.xz";
     sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb";
   };
 
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 12b01baf53d..a60a71e3580 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -1,10 +1,12 @@
 {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
 
 stdenv.mkDerivation rec {
-  name = "vala-0.17.2";
+
+  version = "0.17.2";
+  name = "vala-${version}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/vala/0.17/vala-0.17.2.tar.xz;
+    url = "mirror://gnome/sources/vala/0.17/${name}.tar.xz";
     sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c22a40953ed..fbee8a05152 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2500,13 +2500,13 @@ let
 
   urweb = callPackage ../development/compilers/urweb { };
 
-  vala14 = callPackage ../development/compilers/vala/14.2.nix { };
+  vala = vala17;
 
   vala15 = callPackage ../development/compilers/vala/15.2.nix { };
 
   vala16 = callPackage ../development/compilers/vala/16.1.nix { };
 
-  vala   = callPackage ../development/compilers/vala/default.nix { };
+  vala17 = callPackage ../development/compilers/vala/default.nix { };
 
   visualcpp = callPackage ../development/compilers/visual-c++ { };