diff options
author | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
commit | 1c0d15b90ef67363f798d67d12dd31ed5fccb411 (patch) | |
tree | 3693dd49b591dbbba261e95fc4b78650f1675578 /pkgs/development/libraries/serf | |
parent | bb61b45d92bad2435e80dcac855a78bda57ec7e8 (diff) | |
parent | 2fc76ea05417671306d27f9ba83ef1b8d4049f3d (diff) |
Merge branch 'origin/master' into staging.
Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix
Diffstat (limited to 'pkgs/development/libraries/serf')
-rw-r--r-- | pkgs/development/libraries/serf/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index f0fedba5ac14d..873f59dba3ab8 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }: stdenv.mkDerivation rec { - name = "serf-1.3.7"; + version = "1.3.7"; + name = "serf-${version}"; src = fetchurl { url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2"; - sha1 = "db9ae339dba10a2b47f9bdacf30a58fd8e36683a"; + sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c"; }; buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ]; @@ -30,5 +31,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + inherit version; + downloadPage = "http://serf.googlecode.com/svn/src_releases/"; + updateWalker = true; }; } |