From a28064c96ca867c36e8710293362937ce8a9832f Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 17 Oct 2021 21:32:06 +0530 Subject: [PATCH] fossil: 2.16 -> 2.17 Add option to prefer internal/bundled sqlite3 which is what fossil seems to prefer --- .../version-management/fossil/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ed2cf00291e2..0e6302534ad9 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -6,6 +6,7 @@ , zlib , openssl , readline +, withInternalSqlite ? true , sqlite , ed , which @@ -15,23 +16,25 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy"; + sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; - buildInputs = [ zlib openssl readline sqlite which ed ] - ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ zlib openssl readline which ed ] + ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optional (!withInternalSqlite) sqlite; enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - configureFlags = [ "--disable-internal-sqlite" ] + configureFlags = + lib.optional (!withInternalSqlite) "--disable-internal-sqlite" ++ lib.optional withJson "--json"; preBuild = ''