Merge pull request #142010 from wahjava/fossil-update
This commit is contained in:
commit
84c4d0ce87
@ -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 = ''
|
||||
|
Loading…
Reference in New Issue
Block a user