From d1c585a7908737ea6cb8755c54693bdea13194f6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 29 Nov 2023 12:09:24 +0000 Subject: php81.extensions.sqlite3, php82.extensions.sqlite3: backport sqlite-3.44.0 fix Co-authored-by: Pol Dellaiera --- pkgs/top-level/php-packages.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a6c8905132c68..71d6419c290c7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -607,7 +607,21 @@ lib.makeScope pkgs.newScope (self: with self; { # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.: # - https://github.com/php/php-src/issues/12076 # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f - patches = lib.optional (stdenv.isi686 && stdenv.isLinux) ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch; + patches = lib.optionals (stdenv.isi686 && stdenv.isLinux) [ + ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch + ] ++ lib.optionals (!(lib.versionAtLeast php.version "8.3")) [ + # Fix failing "sqlite3_defensive.phpt" test caused by + # sqlite-3.44.0 compatibility: + # https://github.com/NixOS/nixpkgs/pull/264927#issuecomment-1830827387 + # The patch is already backported to php-8.3.0. Older versions are pending + # the backport. + (fetchpatch { + name = "sqlite-3.44.0.patch"; + url = "https://github.com/php/php-src/commit/2a4775d6a73e9f6d4fc8e7df6f052aa18790a8e9.patch"; + hash = "sha256-2VNfURGZmIEXtoLxOLX5wec9mqNGEWPY3ofCMw4E7S0="; + excludes = [ "NEWS" ]; + }) + ]; } { name = "sysvmsg"; } { name = "sysvsem"; } -- cgit 1.4.1 From 5c014ce103edc986c4f42f020f20c5980b22068a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 2 Nov 2023 03:07:12 +0000 Subject: sqlite, sqlite-analyzer: 3.43.2 -> 3.44.2 Changes: https://sqlite.org/releaselog/3_44_0.html Changes: https://sqlite.org/releaselog/3_44_1.html Changes: https://sqlite.org/releaselog/3_44_2.html --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ec4cc458c4b51..eb4d975a6e01a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.43.2"; + version = "3.44.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-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; + hash = "sha256-HGcZoUi8Qc8PK7vjkm184/XKCdh48SRvzCB2exdbtAc="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 6028c638a7ec2..dd092dd0f0431 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.43.2"; + version = "3.44.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM="; + hash = "sha256-cxh0c/63RQk1fo+my5/WcVOy0BDQCusv3bbO6xirryc="; }; nativeBuildInputs = [ unzip ]; -- cgit 1.4.1