From 7f0f0b2807a73b5e65baf0c8d4bd0937984ac230 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Mon, 24 May 2021 12:46:46 +0300 Subject: [PATCH] sqlite: 3.35.2 -> 3.35.5 (cherry picked from commit 3c1bcd240bb437680b69775d5c324449a02dd135) --- pkgs/development/libraries/sqlite/default.nix | 9 +++++++-- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 50b52b905a9..e2331d89751 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -12,12 +12,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.35.2"; + version = "3.35.5"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1bfczv5006ycwr1vw7xbq7cmys0jvfr8awmx7wi1b40zyj0yss8j"; + sha256 = "9StypcMZw+UW7XqS4SMTmm6Hrwii3EPXdXck9hMubbA="; }; outputs = [ "bin" "dev" "out" ]; @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; + # required for aarch64 but applied for all arches for simplicity + preConfigure = '' + patchShebangs configure + ''; + configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 45bcda727ed..298e87516fe 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.35.2"; + version = "3.35.5"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; - sha256 = "00w7qggrdxpcrs4rfpqkjhcghi8pcx6zzjim9wlz6vsrxlr9dwva"; + sha256 = "9StypcMZw+UW7XqS4SMTmm6Hrwii3EPXdXck9hMubbA="; }; nativeBuildInputs = [ unzip ];