diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2016-08-25 17:27:39 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2016-08-25 17:27:55 +0200 |
| commit | 3aa8f23aec01220773773a633b25dab1831d2def (patch) | |
| tree | 92aa32d14f6ae1be928698edf086ce2333fb3a44 /pkgs/applications/version-management/fossil | |
| parent | 4dc1823e730a61d85961c17b6eda7f6d63c88ca5 (diff) | |
fossil: update to 1.35
Diffstat (limited to 'pkgs/applications/version-management/fossil')
| -rw-r--r-- | pkgs/applications/version-management/fossil/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 58e3a5cc34f7..d940e9b56594 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,24 +1,29 @@ -{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}: +{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which +, tcllib, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-1.33"; + name = "fossil-1.35"; src = fetchurl { urls = [ - https://www.fossil-scm.org/download/fossil-src-1.33.tar.gz + https://www.fossil-scm.org/download/fossil-src-1.35.tar.gz ]; name = "${name}.tar.gz"; - sha256 = "0gkzd9nj3xyznh9x8whv0phdnj11l5c8164rc3l0jvs5i61c95b2"; + sha256 = "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1"; }; - buildInputs = [ zlib openssl readline sqlite ] + buildInputs = [ zlib openssl readline sqlite which ed ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ tcl ]; doCheck = true; checkTarget = "test"; + + preCheck = '' + export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" + ''; configureFlags = if withJson then "--json" else ""; preBuild='' |