From 7befd3471f0ff2c05ca12da1753953960afadb7a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jan 2025 06:25:22 +0000 Subject: [PATCH] sqlite, sqlite-analyzer: 3.47.2 -> 3.48.0 Changes: https://www.sqlite.org/releaselog/3_48_0.html --- pkgs/development/libraries/sqlite/default.nix | 13 +++++-------- pkgs/development/libraries/sqlite/tools.nix | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index c483d5e3a262..5522cab569ab 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -16,17 +16,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.47.2"; + version = "3.48.0"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-8bLuQSwo10cryVupljaNbwzc8ANir/2tsn7ShsF5VAs="; + url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; + hash = "sha256-rJkvf8o5id5+0f6ZwWNj+Eh5TIwyoVja/U65J6LgL9U="; }; docsrc = fetchurl { - url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-bcyommdJAp+6gbwPQYjL1PeKy0jWo+rcbVSK+RF8P0E="; + url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; + hash = "sha256-PcE3/NfGrLMmr2CmG5hE3RXTdzywXnqc4nbEH3E9dlo="; }; outputs = [ "bin" "dev" "man" "doc" "out" ]; @@ -86,9 +86,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # Do not contaminate dependent libtool-based projects with sqlite dependencies. - sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" - mkdir -p $doc/share/doc unzip $docsrc mv sqlite-doc-${archiveVersion version} $doc/share/doc/sqlite diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 29c6192fd7de..fc32439f9e31 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.47.2"; + version = "3.48.0"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-5qRx8SOCJfNMLEjFYBtUAkzFOARDaCMPWf8Gcr4fxiM="; + url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; + hash = "sha256-LXsDK2/f6MRCqoCfhQaHqB0GOB3uzXvjMSYB0oYS5kA="; }; nativeBuildInputs = [ unzip ];