diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2013-10-21 21:47:04 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-10-21 21:47:04 +0200 |
commit | 1adef647a53b758269d62ceb60010270f8779233 (patch) | |
tree | 75cd9b2d809db9cc6222efe267f76c0cfe12aefc | |
parent | b23741da34144bf2e7cf987e2035ee1563111bd6 (diff) | |
parent | 9aa4c9fd843c47956564bf4bb2e34d72da65563b (diff) | |
download | nixlib-1adef647a53b758269d62ceb60010270f8779233.tar nixlib-1adef647a53b758269d62ceb60010270f8779233.tar.gz nixlib-1adef647a53b758269d62ceb60010270f8779233.tar.bz2 nixlib-1adef647a53b758269d62ceb60010270f8779233.tar.lz nixlib-1adef647a53b758269d62ceb60010270f8779233.tar.xz nixlib-1adef647a53b758269d62ceb60010270f8779233.tar.zst nixlib-1adef647a53b758269d62ceb60010270f8779233.zip |
Merge branch 'fossil127' of https://github.com/linuxfood/nixpkgs
-rw-r--r-- | pkgs/applications/version-management/fossil/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index a1959eedba2f..2a669729a9c6 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}: +{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}: stdenv.mkDerivation { - name = "fossil-1.24"; + name = "fossil-1.27"; src = fetchurl { - url = http://www.fossil-scm.org/download/fossil-src-20121022124804.tar.gz; - sha256 = "0gcvcrd368acxd79gh7p7caicgqd0f076n0i2if63mg3b8ivz9im"; + url = http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz; + sha256 = "0n40z8bx2311i11zjx2x15lw3q8vzjwvfqzikrjlqnpal4vzd72f"; }; buildInputs = [ zlib openssl readline sqlite ]; @@ -14,6 +14,7 @@ stdenv.mkDerivation { doCheck = true; checkTarget = "test"; + configureFlags = if withJson then "--json" else ""; preBuild='' export USER=nonexistent-but-specified-user |