sqlite3_analyzer: assert, rename to sqlite-analyzer, clean up

pkgs/development/libraries/sqlite/analyzer.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip, sqlite, tcl }:
+
+stdenv.mkDerivation rec {
+  name = "sqlite-analyzer-${version}";
+  version = "3.23.1";
+
+  src = assert version == sqlite.version; fetchurl {
+    url = https://sqlite.org/2018/sqlite-src-3230100.zip;
+    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
+  };
+
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ tcl ];
+
+  makeFlags = [ "sqlite3_analyzer" ];
+
+  installPhase = "install -Dt $out/bin sqlite3_analyzer";
+
+  meta = with stdenv.lib; {
+    description = "A tool that shows statistics about SQLite databases";
+    downloadPage = http://sqlite.org/download.html;
+    homepage = http://www.sqlite.org;
+    maintainers = with maintainers; [ pesterhazy ];
+    platforms = platforms.unix;
+  };
+}

pkgs/development/libraries/sqlite/sqlite3_analyzer.nix

@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchurl, unzip, tcl }:
-
-stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.23.1";
-
-  src = fetchurl {
-    url = https://sqlite.org/2018/sqlite-src-3230100.zip;
-    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [ tcl ];
-
-  makeFlags = [ "sqlite3_analyzer" ];
-
-  installPhase = ''
-    install -Dm755 sqlite3_analyzer \
-      "$out/bin/sqlite3_analyzer"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.sqlite.org/;
-    description = "A tool that shows statistics about sqlite databases";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ pesterhazy ];
-  };
-}

pkgs/top-level/aliases.nix

@@ -257,6 +257,7 @@ mapAliases (rec {
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   spice_gtk = spice-gtk; # added 2018-02-25
   spice_protocol = spice-protocol; # added 2018-02-25
+  sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   sshfs = sshfs-fuse; # added 2017-08-14
   sshfsFuse = sshfs-fuse; # added 2016-09

pkgs/top-level/all-packages.nix

@@ -11588,7 +11588,7 @@ with pkgs;
 
   sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
 
-  sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { });
+  sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { });
 
   sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;