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"

pkgs/development/tools/build-managers/icmake/default.nix

@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "A program maintenance (make) utility using a C-like grammar";
     homepage = https://fbb-git.github.io/icmake/;
     license = licenses.gpl3;

pkgs/development/tools/misc/ccache/default.nix

@@ -1,15 +1,11 @@
 { stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }:
 
-let
+let ccache = stdenv.mkDerivation rec {
   name = "ccache-${version}";
   version = "3.2.4";
-  sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
 
-  ccache =
-stdenv.mkDerivation {
-  inherit name;
   src = fetchurl {
-    inherit sha256;
+    sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
@@ -65,7 +61,6 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = http://ccache.samba.org/;
     downloadPage = https://ccache.samba.org/download.html;
@@ -73,5 +68,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 };
-in
-ccache
+in ccache

pkgs/development/tools/parsing/lemon/default.nix

@@ -2,8 +2,6 @@
 
 let
 
-  version = "1.0";
-
   srcs = {
     lemon = fetchurl {
       sha256 = "1grm95m2cnc61zim332g7z8nchmcy91ljf50k13lm421v0ygyyv6";
@@ -17,8 +15,9 @@ let
     };
   };
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "lemon-${version}";
+  version = "1.0";
 
   phases = [ "buildPhase" "installPhase" ];
 
@@ -32,7 +31,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "An LALR(1) parser generator";
     longDescription = ''
       The Lemon program is an LALR(1) parser generator that takes a