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

2 files changed, 26 insertions, 27 deletions

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
new file mode 100644
index 000000000000..4b35c457f126
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
deleted file mode 100644
index 2c9e69ac741c..000000000000
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ /dev/null
@@ -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 ];
-  };
-}