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.

pkgs/data/misc/sound-theme-freedesktop/default.nix

@@ -1,8 +1,8 @@
 { stdenv, fetchurl, intltool }:
 
-let version = "0.8"; in
 stdenv.mkDerivation rec {
   name = "sound-theme-freedesktop-${version}";
+  version = "0.8";
 
   src = fetchurl {
     sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ intltool ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Freedesktop reference sound theme";
     homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
     # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS:

pkgs/data/misc/wireless-regdb/default.nix

@@ -1,8 +1,8 @@
 { stdenv, fetchgit }:
 
-let version = "2015-12-14"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
+  version = "2015-12-14";
 
   src = fetchgit {
     sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Wireless regulatory database for CRDA";
     homepage = http://wireless.kernel.org/en/developers/Regulatory/;
     license = licenses.isc;