More version attribute tidying where maintainers |= nckx

pkgs/development/libraries/cpp-netlib/default.nix

@@ -1,11 +1,8 @@
 { stdenv, fetchurl, cmake, boost, openssl }:
 
-let
-  version = "0.11.2";
-in
-
 stdenv.mkDerivation rec {
   name = "cpp-netlib-${version}";
+  version = "0.11.2";
 
   src = fetchurl {
     url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2";
@@ -19,7 +16,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "A collection of open-source libraries for high level network programming";
     homepage    = http://cpp-netlib.org;
     license     = licenses.boost;

pkgs/development/libraries/libpsl/default.nix

@@ -3,8 +3,6 @@
 
 let
 
-  version = "${libVersion}-list-${listVersion}";
-
   listVersion = "2016-01-15";
   listSources = fetchFromGitHub {
     sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5";
@@ -15,8 +13,9 @@ let
 
   libVersion = "0.12.0";
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "libpsl-${version}";
+  version = "${libVersion}-list-${listVersion}";
 
   src = fetchFromGitHub {
     sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw";
@@ -54,7 +53,6 @@ in stdenv.mkDerivation {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "C library for the Publix Suffix List";
     longDescription = ''
       libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"