From a6d8d54e7927bff4d478a27aa72f3b9ce1bc001a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 May 2018 21:19:33 -0500 Subject: [PATCH 1/6] sqlite: 3.22.0 -> 3.23.1 https://sqlite.org/releaselog/3_23_1.html (also contains notes for 3.23.0) Adds CLI support for SQLite archive files: https://sqlite.org/sqlar.html --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b8b7d0c701d..a3e61e3c0ac 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.22.0"; + name = "sqlite-3.23.1"; src = fetchurl { - url = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz"; - sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918"; + url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz; + sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; }; outputs = [ "bin" "dev" "out" ]; From 1d6a14e24a65d41e30c824d1e339a372060d171a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 May 2018 21:33:42 -0500 Subject: [PATCH 2/6] sqlite: Add zlib dep, needed for sqlar support. (and seems generally useful anyway?) --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index a3e61e3c0ac..ff2de38f98b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, interactive ? false, readline ? null, ncurses ? null }: +{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = lib.optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; From 8c755ad7b361952e4c7f2992eacae82959aa4fd5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 17 May 2018 13:03:12 -0500 Subject: [PATCH 3/6] sqlite3_analyzer: 3.22.0 -> 3.23.1 (to match sqlite3) --- pkgs/development/libraries/sqlite/sqlite3_analyzer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index 1feedb94c15..2c9e69ac741 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.22.0"; + name = "sqlite3_analyzer-3.23.1"; src = fetchurl { - url = "https://www.sqlite.org/2018/sqlite-src-3220000.zip"; - sha256 = "04w97jj1659vl84rr73wg1mhj6by8r5075rzpn2xp42n537a7ibv"; + url = https://sqlite.org/2018/sqlite-src-3230100.zip; + sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; }; nativeBuildInputs = [ unzip ]; From 57200f58f476b2c7e8b1cce69f0ef069754e9231 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 22 May 2018 23:43:04 +0300 Subject: [PATCH 4/6] 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 00000000000..4b35c457f12 --- /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 2c9e69ac741..00000000000 --- 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 6591968ed55..53c774c5c60 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 38af4e3a31a..36d0fd8bc16 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; From 25ec13a4f0f2a05000635c1d36dae99fe220a40b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 22 May 2018 23:44:05 +0300 Subject: [PATCH 5/6] sqlite: with stdenv.lib, add downloadPage, add version attribute --- pkgs/development/libraries/sqlite/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ff2de38f98b..ce666dc9c93 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: +{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; -stdenv.mkDerivation { - name = "sqlite-3.23.1"; +with stdenv.lib; +stdenv.mkDerivation rec { + name = "sqlite-${version}"; + version = "3.23.1"; + + # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz; sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; @@ -13,9 +17,9 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; - configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; + configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = [ "-DSQLITE_ENABLE_COLUMN_METADATA" @@ -59,9 +63,10 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ eelco np ]; + downloadPage = http://sqlite.org/download.html; + homepage = http://www.sqlite.org/; + maintainers = with maintainers; [ eelco np ]; + platforms = platforms.unix; }; } From 55807651582419dc94aa5a2a2600b88bbdea1776 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 23 May 2018 00:47:18 +0300 Subject: [PATCH 6/6] sqlite{,-analyzer}: add archiveVersion function --- pkgs/development/libraries/sqlite/analyzer.nix | 6 +++++- pkgs/development/libraries/sqlite/archive-version.nix | 11 +++++++++++ pkgs/development/libraries/sqlite/default.nix | 6 +++++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/sqlite/archive-version.nix diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 4b35c457f12..a0b1220b217 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, unzip, sqlite, tcl }: +let + archiveVersion = import ./archive-version.nix stdenv.lib; +in + 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; + url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; }; diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix new file mode 100644 index 00000000000..1f312ecef23 --- /dev/null +++ b/pkgs/development/libraries/sqlite/archive-version.nix @@ -0,0 +1,11 @@ +lib: version: + +with lib; + +let + fragments = splitString "." version; + major = head fragments; + minor = concatMapStrings (fixedWidthNumber 2) (tail fragments); +in + +major + minor + "00" diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ce666dc9c93..eaeafa74129 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -4,13 +4,17 @@ assert interactive -> readline != null && ncurses != null; with stdenv.lib; +let + archiveVersion = import ./archive-version.nix stdenv.lib; +in + stdenv.mkDerivation rec { name = "sqlite-${version}"; version = "3.23.1"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { - url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz; + url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; };