diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2010-11-22 11:39:42 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2010-11-22 11:39:42 +0000 |
commit | 6af8a1debd89fbb9e5c2164427d004f92c514238 (patch) | |
tree | c14130b5b49a416e7173dce840302560a969a4bc /pkgs/applications/version-management/fossil | |
parent | 7715dc2bebcbfdc46dc1fed7ed33850d024ef1b7 (diff) | |
parent | e8320167d2dba24668302a3d7edc4e4b9a015e58 (diff) |
Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
Diffstat (limited to 'pkgs/applications/version-management/fossil')
-rw-r--r-- | pkgs/applications/version-management/fossil/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 9fa75b4fca48..24a21885767b 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, zlib, openssl}: +{stdenv, fetchurl, zlib, openssl, tcl}: let - version = "20101101142335"; + version = "20101117133825"; in stdenv.mkDerivation { @@ -9,10 +9,15 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; - sha256 = "129a2zf5zpq397nmmmk31k1yhkgvrssgrh9z4aaj6lh50s3ax0bh"; + sha256 = "0h4g7qsbz5vyd3zxywcc2pf6vf3gavxqznpx8gn47j8y6mjp4byn"; }; - buildInputs = [ zlib openssl ]; + buildInputs = [ zlib openssl tcl ]; + buildNativeInputs = [ zlib openssl ]; + + doCheck = true; + + checkTarget = "test"; installPhase = '' ensureDir $out/bin @@ -20,6 +25,7 @@ stdenv.mkDerivation { ''; crossAttrs = { + doCheck = false; makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ]; }; @@ -33,9 +39,11 @@ stdenv.mkDerivation { from the others by being extremely simple to setup and operate. ''; homepage = http://www.fossil-scm.org/; - license = "GPLv2"; + license = "BSD"; + platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z + stdenv.lib.maintainers.viric ]; }; } |