Add version attribute where maintainers |= nckx

This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.

4 files changed, 12 insertions, 15 deletions

diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 749e1864fda9..e5e8f823d277 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pythonPackages }:
 
-let version = "2.21"; in
 pythonPackages.buildPythonPackage rec {
   name = "rawdog-${version}";
+  version = "2.21";
 
   src = fetchurl {
     url = "http://offog.org/files/${name}.tar.gz";
@@ -14,7 +14,6 @@ pythonPackages.buildPythonPackage rec {
   namePrefix = "";
   
   meta = with stdenv.lib; {
-    inherit version;
     homepage = "http://offog.org/code/rawdog/";
     description = "RSS Aggregator Without Delusions Of Grandeur";
     license = licenses.gpl2;
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 40c165c2540c..fd349b320d28 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
-let version = "2.1"; in
 stdenv.mkDerivation rec {
   name = "rsstail-${version}";
+  version = "2.1";
 
   src = fetchFromGitHub {
     sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Monitor RSS feeds for new entries";
     longDescription = ''
       RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index fdc27b63e9e3..ffebeb744cea 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,22 +1,14 @@
 { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
 
-let version = "4.0.5.0"; in
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
+  version = "4.0.5.0";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
     sha256 = "18a2pszh0nq2ir64a1ah1mlzddn4qcd12b339bv30n0y1ir92bi4";
   };
 
-  meta = with stdenv.lib; {
-    description = "Graphical NoMachine NX3 remote desktop client";
-    homepage = http://x2go.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
   nativeBuildInputs = [ makeWrapper ];
 
@@ -35,4 +27,12 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin";
   '';
+
+  meta = with stdenv.lib; {
+    description = "Graphical NoMachine NX3 remote desktop client";
+    homepage = http://x2go.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index a553de8abb26..1c78f926fe7b 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, gd, ncurses }:
 
-let version = "1.15"; in
 stdenv.mkDerivation rec {
   name = "vnstat-${version}";
+  version = "1.15";
 
   src = fetchurl {
     sha256 = "0fdw3nbrfm4acv48r0934ls6ld5lwkff3gyym2c72qlbm9dlp0f3";
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Console-based network statistics utility for Linux";
     longDescription = ''
       vnStat is a console-based network traffic monitor for Linux and BSD that