diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-16 12:48:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 12:48:46 +0100 |
| commit | 84c4d0ce8724e56a54e15e0df92cf2f7168e2a3f (patch) | |
| tree | 51402f1c427a522a37848c7948a0b3177d96d83c | |
| parent | f8e1e18b1268181e03584a04466355b05ec3fb75 (diff) | |
| parent | a28064c96ca867c36e8710293362937ce8a9832f (diff) | |
Merge pull request #142010 from wahjava/fossil-update
| -rw-r--r-- | pkgs/applications/version-management/fossil/default.nix | 13 |
1 files 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 = '' |