Merge pull request #142010 from wahjava/fossil-update

This commit is contained in:
Sandro 2021-11-16 12:48:46 +01:00 committed by GitHub
commit 84c4d0ce87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 = ''