From e8cc4e54ce3acd408ef566e2ac4861038e10e874 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 6 Sep 2023 01:17:50 +0100 Subject: [PATCH] sqlite, sqlite-analyzer: 3.42.0 -> 3.43.1 While at it added trivial updater. Changes: https://sqlite.org/releaselog/3_43_0.html Changes: https://sqlite.org/releaselog/3_43_1.html --- pkgs/development/libraries/sqlite/default.nix | 21 ++++++++++++++----- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index cc26df385a5c..441dfa99c37a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -7,6 +7,8 @@ , interactive ? false # TODO: can be removed since 3.36 since it is the default now. , enableDeserialize ? false + +, gitUpdater }: let @@ -15,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.42.0"; + version = "3.43.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-erz9FhxuJ0LKXGwIldH4U8lA8gMwSgtJ2k4eyl0IjKY="; + hash = "sha256-RtsvEPMG4WPkVxuJdNRM03B4quBClbvwiyU2Vd8yZfQ="; }; outputs = [ "bin" "dev" "out" ]; @@ -87,9 +89,18 @@ stdenv.mkDerivation rec { doCheck = false; # fails to link against tcl - passthru.tests = { - inherit (python3Packages) sqlalchemy; - inherit sqldiff sqlite-analyzer tracker; + passthru = { + tests = { + inherit (python3Packages) sqlalchemy; + inherit sqldiff sqlite-analyzer tracker; + }; + + updateScript = gitUpdater { + # No nicer place to look for patest version. + url = "https://github.com/sqlite/sqlite.git"; + # Expect tags like "version-3.43.0". + rev-prefix = "version-"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index c30ce8d45d9a..31207ad9edf9 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.42.0"; + version = "3.43.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-OMpWoxe+N/sAvZK8KA2bkgm9QAiyl9SDxB7B9geb+20="; + hash = "sha256-IunC70n+b4otvJPE09zgnG1qT1Y95SsKgXGtSajHKRc="; }; nativeBuildInputs = [ unzip ];