ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #264927 from trofi/sqlite-update

Browse Source 
sqlite, sqlite-analyzer: 3.43.2 -> 3.44.2
This commit is contained in:
Mario Rodas 2023-12-02 11:50:16 -05:00 committed by GitHub
commit 50ece7774f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/sqlite/default.nix
View File

@ -17,13 +17,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sqlite${lib.optionalString interactive "-interactive"}"; pname = "sqlite${lib.optionalString interactive "-interactive"}";
version = "3.43.2"; version = "3.44.2";
# nixpkgs-update: no auto update # nixpkgs-update: no auto update
# NB! Make sure to update ./tools.nix src (in the same directory). # NB! Make sure to update ./tools.nix src (in the same directory).
src = fetchurl { src = fetchurl {
url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz";
hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; hash = "sha256-HGcZoUi8Qc8PK7vjkm184/XKCdh48SRvzCB2exdbtAc=";
}; };
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];

4
pkgs/development/libraries/sqlite/tools.nix
View File

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

16
pkgs/top-level/php-packages.nix
View File

@ -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.: # 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://github.com/php/php-src/issues/12076
# - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f # - 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 = "sysvmsg"; }
{ name = "sysvsem"; } { name = "sysvsem"; }