Merge pull request #130469 from Stunkymonkey/inherit-version2

various: cleanup of "inherit version;"

pkgs/development/interpreters/clojure/clooj.nix

···
 { lib, stdenv, fetchurl, jre, makeWrapper }:
 
-let version = "0.4.4"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "clooj";
-  inherit version;
+  version = "0.4.4";
 
   jar = fetchurl {
     # mirrored as original mediafire.com source does not work without user interaction
-    url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar";
+    url = "https://archive.org/download/clooj-${version}-standalone/clooj-${version}-standalone.jar";
     sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
   };
 

pkgs/development/interpreters/eff/default.nix

···
 { lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
 
-let version = "5.0"; in
-
-stdenv.mkDerivation {
-
+stdenv.mkDerivation rec {
   pname = "eff";
-  inherit version;
+  version = "5.0";
 
   src = fetchFromGitHub {
     owner = "matijapretnar";

pkgs/development/interpreters/gnu-apl/default.nix

···
     license     = licenses.gpl3Plus;
     maintainers = [ maintainers.kovirobi ];
     platforms   = with platforms; linux ++ darwin;
-    inherit version;
     mainProgram = "apl";
 
     longDescription = ''

pkgs/development/interpreters/pyrex/0.9.5.nix

···
 { lib, fetchurl, python2Packages }:
 
-let version = "0.9.5.1.1"; in
-
-python2Packages.buildPythonPackage {
+python2Packages.buildPythonPackage rec {
   pname = "pyrex";
-  inherit version;
+  version = "0.9.5.1.1";
 
   src = fetchurl {
     url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";

pkgs/development/interpreters/pyrex/0.9.6.nix

···
 { lib, fetchurl, python2Packages }:
 
-let version = "0.9.6.4"; in
-
-python2Packages.buildPythonPackage {
+python2Packages.buildPythonPackage rec {
   pname = "pyrex";
-  inherit version;
+  version = "0.9.6.4";
 
   src = fetchurl {
     url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";

pkgs/development/libraries/afflib/default.nix

···
     platforms = lib.platforms.unix;
     license = lib.licenses.bsdOriginal;
     maintainers = [ lib.maintainers.raskin ];
-    inherit version;
     downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
   };
 }

pkgs/development/libraries/bctoolbox/default.nix

···
   NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
 
   meta = with lib; {
-    inherit version;
     description = "Utilities library for Linphone";
     homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
     license = licenses.gpl3Plus;

pkgs/development/libraries/botan/generic.nix

···
   '';
 
   meta = with lib; {
-    inherit version;
     description = "Cryptographic algorithms library";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;

pkgs/development/libraries/csfml/default.nix

···
 { lib, stdenv, fetchFromGitHub, cmake, sfml }:
 
-let
-  version = "2.5";
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "csfml";
-  inherit version;
+  version = "2.5";
   src = fetchFromGitHub {
     owner = "SFML";
     repo  = "CSFML";

pkgs/development/libraries/flint/default.nix

···
 
   doCheck = true;
   meta = {
-    inherit version;
     description = "Fast Library for Number Theory";
     license = lib.licenses.gpl2Plus;
     maintainers = lib.teams.sage.members;

pkgs/development/libraries/fplll/20160331.nix

···
   nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
   buildInputs = [gmp mpfr];
   meta = {
-    inherit version;
     description = "Lattice algorithms using floating-point arithmetic";
     license = lib.licenses.lgpl21Plus;
     maintainers = [lib.maintainers.raskin];

pkgs/development/libraries/freeglut/default.nix

···
 { lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
 
-let version = "3.2.1";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "freeglut";
-  inherit version;
+  version = "3.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";

pkgs/development/libraries/globalarrays/default.nix

···
 , blas, gfortran, openssh, mpi
 } :
 
-let
+stdenv.mkDerivation rec {
+  pname = "globalarrays";
   version = "5.8";
-
-in stdenv.mkDerivation {
-  pname = "globalarrays";
-  inherit version;
 
   src = fetchFromGitHub {
     owner = "GlobalArrays";

pkgs/development/libraries/gloox/default.nix

···
 
 with lib;
 
-let
+stdenv.mkDerivation rec{
+  pname = "gloox";
   version = "1.0.24";
-in
-stdenv.mkDerivation {
-  pname = "gloox";
-  inherit version;
 
   src = fetchurl {
     url = "https://camaya.net/download/gloox-${version}.tar.bz2";

pkgs/development/libraries/highfive/default.nix

···
   ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
 
   meta = with lib; {
-    inherit version;
     description = "Header-only C++ HDF5 interface";
     license = licenses.boost;
     homepage = "https://bluebrain.github.io/HighFive/";

pkgs/development/libraries/kdsoap/default.nix

···
 , qtbase
 }:
 
-let
-  version = "1.10.0";
-in
-
-mkDerivation {
+mkDerivation rec {
   pname = "kdsoap";
-  inherit version;
+  version = "1.10.0";
   meta = {
     description = "A Qt-based client-side and server-side SOAP component";
     longDescription = ''

pkgs/development/libraries/libbladeRF/default.nix

···
 { stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla
 , libusb1, udev }:
-
 let
   # fetch submodule
   noos = fetchFromGitHub {
···
     rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157";
     sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c";
   };
-
+in stdenv.mkDerivation rec {
+  pname = "libbladeRF";
   version = "2.2.1";
-
-in stdenv.mkDerivation {
-  pname = "libbladeRF";
-  inherit version;
 
   src = fetchFromGitHub {
     owner = "Nuand";

pkgs/development/libraries/libcec/default.nix

···
 { lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
 
-let version = "6.0.2"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libcec";
-  inherit version;
+  version = "6.0.2";
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";

pkgs/development/libraries/libcec/platform.nix

···
 { lib, stdenv, fetchurl, cmake }:
 
-let version = "2.1.0.1"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "p8-platform";
-  inherit version;
+  version = "2.1.0.1";
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";

pkgs/development/libraries/libdynd/default.nix

···
 { lib, stdenv, fetchFromGitHub, cmake }:
 
-let version = "0.7.2"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libdynd";
-  inherit version;
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "libdynd";

pkgs/development/libraries/libjson/default.nix

···
 { lib, stdenv, fetchurl, unzip }:
-let
+
+stdenv.mkDerivation rec {
+  pname = "libjson";
   version = "7.6.1";
-in stdenv.mkDerivation {
-  pname = "libjson";
-  inherit version;
   src = fetchurl {
     url = "mirror://sourceforge/libjson/libjson_${version}.zip";
     sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";

pkgs/development/libraries/libmodplug/default.nix

···
 { lib, stdenv, fetchurl, file }:
 
-let
-  version = "0.8.9.0";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "libmodplug";
-  inherit version;
+  version = "0.8.9.0";
 
   preConfigure = ''
      substituteInPlace configure \

pkgs/development/libraries/libmpc/default.nix

···
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-let
-  version = "1.2.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libmpc";
-  inherit version; # to avoid clash with the MPD client
+  version = "1.2.1"; # to avoid clash with the MPD client
 
   src = fetchurl {
     url = "mirror://gnu/mpc/mpc-${version}.tar.gz";

pkgs/development/libraries/libopus/default.nix

···
 { lib, stdenv, fetchurl
 , fixedPoint ? false, withCustomModes ? true }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "libopus";
   version = "1.3.1";
-in
-stdenv.mkDerivation {
-  pname = "libopus";
-  inherit version;
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";

pkgs/development/libraries/libopusenc/default.nix

···
 { lib, stdenv, fetchurl, pkg-config, libopus }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "libopusenc";
   version = "0.2.1";
-in
-stdenv.mkDerivation {
-  pname = "libopusenc";
-  inherit version;
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";

pkgs/development/libraries/libossp-uuid/default.nix

···
 {lib, stdenv, fetchurl}:
 
-let version = "1.6.2"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libossp-uuid";
-  inherit version;
+  version = "1.6.2";
 
   src = fetchurl {
     url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz";

pkgs/development/libraries/libspatialindex/default.nix

···
 { lib, stdenv, fetchurl }:
 
-let version = "1.8.5"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libspatialindex";
-  inherit version;
+  version = "1.8.5";
 
   src = fetchurl {
     url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";

pkgs/development/libraries/libxc/default.nix

···
 { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "libxc";
   version = "5.1.5";
-
-in stdenv.mkDerivation {
-  pname = "libxc";
-  inherit version;
 
   src = fetchFromGitLab {
     owner = "libxc";

pkgs/development/libraries/libzmf/default.nix

···
   configureFlags = [ "--disable-werror" ];
 
   meta = {
-    inherit version;
     description = "A library that parses the file format of Zoner Callisto/Draw documents";
     license = lib.licenses.mpl20;
     maintainers = [lib.maintainers.raskin];

pkgs/development/libraries/phash/default.nix

···
   };
 
   meta = with lib; {
-    inherit version;
     description = "Compute the perceptual hash of an image";
     license = licenses.gpl3;
     maintainers = [maintainers.imalsogreg];

pkgs/development/libraries/spandsp/default.nix

···
     maintainers = with lib.maintainers; [raskin];
     license = lib.licenses.gpl2;
     downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
-    inherit version;
     updateWalker = true;
   };
 }

pkgs/development/tools/analysis/rizin/default.nix

···
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ raskin makefu mic92 ];
     platforms = with lib.platforms; linux;
-    inherit version;
   };
 }

pkgs/development/tools/build-managers/apache-ant/1.9.nix

···
 { fetchurl, lib, stdenv, coreutils, makeWrapper }:
 
-let version = "1.9.16"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "ant";
-  inherit version;
+  version = "1.9.16";
 
   nativeBuildInputs = [ makeWrapper ];
 

pkgs/development/tools/build-managers/apache-ant/default.nix

···
 { fetchurl, lib, stdenv, coreutils, makeWrapper }:
 
-let version = "1.10.11"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "ant";
-  inherit version;
+  version = "1.10.11";
 
   nativeBuildInputs = [ makeWrapper ];
 

pkgs/development/tools/build-managers/gnumake/4.2/default.nix

···
 
 assert guileSupport -> ( pkg-config != null && guile != null );
 
-let
+stdenv.mkDerivation rec {
+  pname = "gnumake";
   version = "4.2.1";
-in
-stdenv.mkDerivation {
-  pname = "gnumake";
-  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/make/make-${version}.tar.bz2";

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

···
 { lib, stdenv, fetchurl, guileSupport ? false, pkg-config, guile }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "gnumake";
   version = "4.3";
-in
-stdenv.mkDerivation {
-  pname = "gnumake";
-  inherit version;
 
   src = fetchurl {
     url = "mirror://gnu/make/make-${version}.tar.gz";

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

···
 { lib, stdenv, fetchurl, erlang }:
 
-
-let
-  version = "2.6.4";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "rebar";
-  inherit version;
+  version = "2.6.4";
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";

pkgs/development/tools/continuous-integration/drone-cli/default.nix

···
 { lib, fetchFromGitHub, buildGoModule }:
 
-let version = "1.3.0";
-in buildGoModule rec {
-  inherit version;
+buildGoModule rec {
+  version = "1.3.0";
   pname = "drone-cli";
   revision = "v${version}";
 

pkgs/development/tools/database/squirrel-sql/default.nix

···
 , jre
 , drivers ? []
 }:
-let
-  version = "4.1.0";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "squirrel-sql";
-  inherit version;
+  version = "4.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";

pkgs/development/tools/flyway/default.nix

···
 { lib, stdenv, fetchurl, jre_headless, makeWrapper }:
-  let
-    version = "7.5.4";
-  in
-    stdenv.mkDerivation {
-      pname = "flyway";
-      inherit version;
-      src = fetchurl {
-        url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-        sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I=";
-      };
-      nativeBuildInputs = [ makeWrapper ];
-      dontBuild = true;
-      dontStrip = true;
-      installPhase = ''
-        mkdir -p $out/bin $out/share/flyway
-        cp -r sql jars drivers conf $out/share/flyway
-        install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar
-        makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
-          --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
-          --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
-          --add-flags "org.flywaydb.commandline.Main" \
-          --add-flags "-jarDirs='$out/share/flyway/jars'"
-      '';
-      meta = with lib; {
-        description = "Evolve your Database Schema easily and reliably across all your instances";
-        longDescription = ''
-          The Flyway command-line tool is a standalone Flyway distribution.
-          It is primarily meant for users who wish to migrate their database from the command-line
-          without having to integrate Flyway into their applications nor having to install a build tool.
+stdenv.mkDerivation rec{
+  pname = "flyway";
+  version = "7.5.4";
+  src = fetchurl {
+    url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
+    sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I=";
+  };
+  nativeBuildInputs = [ makeWrapper ];
+  dontBuild = true;
+  dontStrip = true;
+  installPhase = ''
+    mkdir -p $out/bin $out/share/flyway
+    cp -r sql jars drivers conf $out/share/flyway
+    install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar
+    makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
+      --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
+      --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
+      --add-flags "org.flywaydb.commandline.Main" \
+      --add-flags "-jarDirs='$out/share/flyway/jars'"
+  '';
+  meta = with lib; {
+    description = "Evolve your Database Schema easily and reliably across all your instances";
+    longDescription = ''
+      The Flyway command-line tool is a standalone Flyway distribution.
+      It is primarily meant for users who wish to migrate their database from the command-line
+      without having to integrate Flyway into their applications nor having to install a build tool.
 
-          This package is only the Community Edition of the Flyway command-line tool.
-        '';
-        homepage = "https://flywaydb.org/";
-        license = licenses.asl20;
-        platforms = platforms.unix;
-        maintainers = [ maintainers.cmcdragonkai ];
-      };
-    }
+      This package is only the Community Edition of the Flyway command-line tool.
+    '';
+    homepage = "https://flywaydb.org/";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.cmcdragonkai ];
+  };
+}

pkgs/development/tools/java/fastjar/default.nix

···
 { fetchurl, lib, stdenv, zlib }:
 
-let version = "0.98"; in
-  stdenv.mkDerivation {
-    pname = "fastjar";
-    inherit version;
+stdenv.mkDerivation rec {
+  pname = "fastjar";
+  version = "0.98";
 
-    src = fetchurl {
-      url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
-      sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi";
-    };
+  src = fetchurl {
+    url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
+    sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi";
+  };
 
-    buildInputs = [ zlib ];
+  buildInputs = [ zlib ];
 
-    doCheck = true;
+  doCheck = true;
 
-    meta = {
-      description = "Fast Java archiver written in C";
+  meta = {
+    description = "Fast Java archiver written in C";
 
-      longDescription = ''
-        Fastjar is a version of Sun's `jar' utility, written entirely in C, and
-        therefore quite a bit faster.  Fastjar can be up to 100x faster than
-        the stock `jar' program running without a JIT.
-      '';
+    longDescription = ''
+      Fastjar is a version of Sun's `jar' utility, written entirely in C, and
+      therefore quite a bit faster.  Fastjar can be up to 100x faster than
+      the stock `jar' program running without a JIT.
+    '';
 
-      homepage = "https://savannah.nongnu.org/projects/fastjar/";
+    homepage = "https://savannah.nongnu.org/projects/fastjar/";
 
-      license = lib.licenses.gpl2Plus;
-      platforms = lib.platforms.linux;
-      maintainers = [ ];
-    };
-  }
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ ];
+  };
+}

pkgs/development/tools/jq/default.nix

···
     platforms = with platforms; linux ++ darwin;
     downloadPage = "http://stedolan.github.io/jq/download/";
     updateWalker = true;
-    inherit version;
   };
 }

pkgs/development/tools/minizinc/default.nix

···
 { lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
-let
+stdenv.mkDerivation rec {
+  pname = "minizinc";
   version = "2.5.5";
-in
-stdenv.mkDerivation {
-  pname = "minizinc";
-  inherit version;
 
   nativeBuildInputs = [ cmake flex bison ];
 

pkgs/development/tools/minizinc/ide.nix

···
 { lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
-let
+mkDerivation rec {
+  pname = "minizinc-ide";
   version = "2.5.3";
-in
-mkDerivation {
-  pname = "minizinc-ide";
-  inherit version;
 
   nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase qtwebengine qtwebkit ];

pkgs/development/tools/misc/dfu-programmer/default.nix

···
 { lib, stdenv, fetchurl, libusb-compat-0_1 }:
-let
-  version = "0.7.2";
-in
 stdenv.mkDerivation rec {
   pname = "dfu-programmer";
-  inherit version;
+  version = "0.7.2";
 
   buildInputs = [ libusb-compat-0_1 ];
 

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

···
   '';
 
   meta = with lib; {
-    inherit version;
     description = "A package manager for Lua";
     license = licenses.mit ;
     maintainers = with maintainers; [raskin teto];

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

···
 { lib, pythonPackages, fetchFromGitHub }:
 
-let version = "0.1.2"; in
-pythonPackages.buildPythonApplication {
+pythonPackages.buildPythonApplication rec {
   pname = "nixbang";
-  inherit version;
+  version = "0.1.2";
   namePrefix = "";
 
   src = fetchFromGitHub {

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

···
 { lib, stdenv, fetchurl, libelf }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "prelink";
   version = "20130503";
-in
-stdenv.mkDerivation {
-  pname = "prelink";
-  inherit version;
 
   buildInputs = [
     libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc)

pkgs/development/tools/ocaml/obuild/default.nix

···
 { lib, stdenv, fetchzip, ocaml }:
 
-let version = "0.1.10"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "obuild";
-  inherit version;
+  version = "0.1.10";
 
   src = fetchzip {
     url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz";

pkgs/development/tools/ocaml/ocamlbuild/default.nix

···
 { lib, stdenv, fetchFromGitHub, ocaml, findlib }:
-let
+stdenv.mkDerivation rec {
+  name = "ocamlbuild-${version}";
   version = "0.14.0";
-in
-stdenv.mkDerivation {
-  name = "ocamlbuild-${version}";
-  inherit version;
 
   src = fetchFromGitHub {
     owner = "ocaml";

pkgs/development/tools/parsing/bisonc++/default.nix

···
   '';
 
   meta = with lib; {
-    inherit version;
     description = "A parser generator like bison, but it generates C++ code";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ raskin ];

pkgs/development/tools/spirv-tools/default.nix

···
 { lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
-let
-  # Update spirv-headers rev in lockstep according to DEPs file
-  version = "2020.2";
-in
 
 stdenv.mkDerivation rec {
   pname = "spirv-tools";
-  inherit version;
+  # Update spirv-headers rev in lockstep according to DEPs file
+  version = "2020.2";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";

pkgs/tools/filesystems/fuse-7z-ng/default.nix

···
   '';
 
   meta = with lib; {
-    inherit version;
     inherit (src.homepage);
     description = "A FUSE-based filesystem that uses the p7zip library";
     longDescription = ''

pkgs/tools/filesystems/jmtpfs/default.nix

···
 { lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, file, fuse, libmtp }:
 
-let version = "0.5"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "jmtpfs";
-  inherit version;
+  version = "0.5";
 
   src = fetchFromGitHub {
     sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";

pkgs/tools/filesystems/reiser4progs/default.nix

···
 {lib, stdenv, fetchurl, libaal}:
 
-let version = "2.0.4"; in
 stdenv.mkDerivation rec {
   pname = "reiser4progs";
-  inherit version;
+  version = "2.0.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz";

pkgs/tools/filesystems/reiserfsprogs/default.nix

···
 { lib, stdenv, fetchurl, libuuid, autoreconfHook }:
 
-let version = "3.6.24"; in
 stdenv.mkDerivation rec {
   pname = "reiserfsprogs";
-  inherit version;
+  version = "3.6.24";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz";

pkgs/tools/filesystems/zfstools/default.nix

···
 { lib, stdenv, fetchFromGitHub, ruby, zfs }:
 
-let version = "0.3.6"; in
 stdenv.mkDerivation rec {
   pname = "zfstools";
-  inherit version;
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";