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.

8 files changed, 45 insertions, 51 deletions

diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index 315aab074e5..e2e5f079606 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase }:
 
-let version = "1.13"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "accounts-qt-${version}";
+  version = "1.13";
 
   src = fetchFromGitLab {
     sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
@@ -11,17 +11,17 @@ stdenv.mkDerivation {
     owner = "accounts-sso";
   };
 
-  meta = with stdenv.lib; {
-    description = "Qt library for accessing the online accounts database";
-    homepage = "http://code.google.com/p/accounts-sso/";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ glib libaccounts-glib qtbase ];
   nativeBuildInputs = [ doxygen pkgconfig ];
 
   configurePhase = ''
     qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
   '';
+
+  meta = with stdenv.lib; {
+    description = "Qt library for accessing the online accounts database";
+    homepage = "http://code.google.com/p/accounts-sso/";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 87eb1e324ce..b83fd0f7487 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
-let version = "4.00.00"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bobcat-${version}";
+  version = "4.00.00";
 
   src = fetchFromGitHub {
     sha256 = "0wdb25sgw7i3jk3lbja6b4ipqfg1sncam6adg2bn8l5fcinrpwgs";
@@ -12,15 +12,6 @@ stdenv.mkDerivation {
     owner = "fbb-git";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Brokken's Own Base Classes And Templates";
-    homepage = https://fbb-git.github.io/bobcat/;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
@@ -39,4 +30,12 @@ stdenv.mkDerivation {
   installPhase = ''
     ./build install
   '';
+
+  meta = with stdenv.lib; {
+    description = "Brokken's Own Base Classes And Templates";
+    homepage = https://fbb-git.github.io/bobcat/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index 7bf4e746db4..109510df79b 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, autoreconfHook }:
 
-let version = "7.0.2"; in # meta.homepage might change after a major update
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ip2location-c-${version}";
+  version = "7.0.2"; # meta.homepage might change after a major update
 
   src = fetchurl {
     sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx";
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Library to look up locations of host names and IP addresses";
     longDescription = ''
       A C library to find the country, region, city,coordinates,
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index 7798eb5f8fc..1c247f6faa8 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "1.9.7"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libcli-${version}";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c";
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index bde5db77fda..9ea4748af4b 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, fftw, qtbase }:
 
-let version = "2.1"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libkeyfinder-${version}";
+  version = "2.1";
 
   src = fetchFromGitHub {
     sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7";
@@ -11,15 +11,6 @@ stdenv.mkDerivation {
     owner = "ibsh";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Musical key detection for digital audio (C++ library)";
-    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ fftw qtbase ];
 
   postPatch = ''
@@ -40,4 +31,12 @@ stdenv.mkDerivation {
     mkdir -p $out/lib
     cp -a lib*.so* $out/lib
   '';
+
+  meta = with stdenv.lib; {
+    description = "Musical key detection for digital audio (C++ library)";
+    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 72aaa1593cc..75cca9a028e 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
-let version = "1.0.5"; in
 stdenv.mkDerivation rec {
   name = "libnetfilter_conntrack-${version}";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index 3a65277abe2..b19706c2c37 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,23 +1,14 @@
 { stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
 
-let version = "3.5.0.32"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libxcomp-${version}";
+  version = "3.5.0.32";
 
   src = fetchurl {
     sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
     url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "NX compression library";
-    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ libjpeg libpng12 libX11 zlib ];
   nativeBuildInputs = [ autoreconfHook ];
 
@@ -26,4 +17,12 @@ stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "NX compression library";
+    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
index b87d4ed4ee4..524afd7cf4d 100644
--- a/pkgs/development/libraries/rote/default.nix
+++ b/pkgs/development/libraries/rote/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, ncurses }:
 
-let version = "0.2.8"; in
 stdenv.mkDerivation rec {
   name = "rote-${version}";
+  version = "0.2.8";
 
   src = fetchurl {
     sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Our Own Terminal Emulation Library";
     longDescription = ''
       ROTE is a simple C library for VT102 terminal emulation. It allows the