Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

3 files changed, 16 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix
index f0bbc93a6f1d..2b7a472d1e78 100644
--- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
+{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null
+, python3Packages
+}:
 
 assert interactive -> readline != null && ncurses != null;
 
-with stdenv.lib;
+with lib;
 
 let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
+  archiveVersion = import ./archive-version.nix lib;
 in
 
 stdenv.mkDerivation rec {
@@ -73,6 +75,10 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails to link against tcl
 
+  passthru.tests = {
+    inherit (python3Packages) sqlalchemy;
+  };
+
   meta = {
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
     downloadPage = "https://sqlite.org/download.html";
diff --git a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
index 78ac8ba6448a..0828f2f45543 100644
--- a/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/sqlar.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fuse, zlib }:
+{ lib, stdenv, fetchurl, fuse, zlib }:
 
 stdenv.mkDerivation {
   pname = "sqlar";
@@ -11,13 +11,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ fuse zlib ];
 
-  buildFlags = [ "sqlar" "sqlarfs" ];
+  buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ];
 
   installPhase = ''
     install -D -t $out/bin sqlar sqlarfs
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://sqlite.org/sqlar";
     description = "SQLite Archive utilities";
     license = licenses.bsd2;
diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
index 0eb913adb3b9..3ec528719e9e 100644
--- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
+++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
+{ lib, stdenv, fetchurl, unzip, sqlite, tcl, Foundation }:
 
 let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
+  archiveVersion = import ./archive-version.nix lib;
   mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
     inherit pname;
     version = "3.34.0";
@@ -12,13 +12,13 @@ let
     };
 
     nativeBuildInputs = [ unzip ];
-    buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation;
+    buildInputs = [ tcl ] ++ lib.optional stdenv.isDarwin Foundation;
 
     makeFlags = [ makeTarget ];
 
     installPhase = "install -Dt $out/bin ${makeTarget}";
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       inherit description homepage;
       downloadPage = http://sqlite.org/download.html;
       license = licenses.publicDomain;