Merge pull request #268787 from wmertens/sqlite-update

sqlite: 1.41.2 -> 1.43.2
This commit is contained in:
Wout Mertens
2023-11-20 19:10:01 +01:00
committed by GitHub
2 changed files with 19 additions and 7 deletions

View File

@@ -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.41.2";
version = "3.43.2";
# 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-6YwQDdHaTjD6Rgdh2rfAuRpQt4XhZ/jFesxGUU+ulJk=";
hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA=";
};
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; {
@@ -101,5 +112,6 @@ stdenv.mkDerivation rec {
mainProgram = "sqlite3";
maintainers = with maintainers; [ eelco np ];
platforms = platforms.unix ++ platforms.windows;
pkgConfigModules = [ "sqlite3" ];
};
}

View File

@@ -4,12 +4,12 @@ let
archiveVersion = import ./archive-version.nix lib;
mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec {
inherit pname;
version = "3.41.2";
version = "3.43.2";
# nixpkgs-update: no auto update
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip";
hash = "sha256-hxkfzsuLcH2aEO2xNgdoYxfXFpwIC5vcXTnQY1g3bMw=";
hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM=";
};
nativeBuildInputs = [ unzip ];