diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-12-02 11:50:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-02 11:50:16 -0500 |
commit | 50ece7774fa923224dd38e1ca61957d6a24d8134 (patch) | |
tree | d6cb7ae93e01f57cbc391bd74519d4b44df65ae1 /pkgs | |
parent | cb710456f61e7ead14f4b1ed11657825c2528ce7 (diff) | |
parent | 5c014ce103edc986c4f42f020f20c5980b22068a (diff) |
Merge pull request #264927 from trofi/sqlite-update
sqlite, sqlite-analyzer: 3.43.2 -> 3.44.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/sqlite/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/sqlite/tools.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 16 |
3 files changed, 19 insertions, 5 deletions
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 ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cda91b8c627b4..cb31f566b4ddb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -609,7 +609,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"; } |