From 57200f58f476b2c7e8b1cce69f0ef069754e9231 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 22 May 2018 23:43:04 +0300 Subject: [PATCH] sqlite3_analyzer: assert, rename to sqlite-analyzer, clean up --- .../development/libraries/sqlite/analyzer.nix | 26 ++++++++++++++++++ .../libraries/sqlite/sqlite3_analyzer.nix | 27 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/libraries/sqlite/analyzer.nix delete mode 100644 pkgs/development/libraries/sqlite/sqlite3_analyzer.nix 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 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6591968ed55b..53c774c5c603 100644 --- a/pkgs/top-level/aliases.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38af4e3a31ad..36d0fd8bc169 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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;