serf: Update to 1.3.6

pkgs/development/libraries/serf/default.nix

@@ -1,25 +1,15 @@
-{stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="serf";
-    version="1.3.3";
-    name="${baseName}-${version}";
-    hash="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2";
-    url="https://serf.googlecode.com/files/serf-1.3.3.tar.bz2";
-    sha256="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2";
-  };
-  buildInputs = [
-    apr scons openssl aprutil zlib krb5 pkgconfig
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
+{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "serf-1.3.6";
+
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
+    sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya";
   };
 
+  buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];
+
   configurePhase = ''
     sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
     sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct
@@ -36,7 +26,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    inherit (s) version;
     description = "HTTP client library based on APR";
     license = stdenv.lib.licenses.asl20 ;
     maintainers = [stdenv.lib.maintainers.raskin];

pkgs/development/libraries/serf/default.upstream

@@ -1,3 +0,0 @@
-url https://code.google.com/p/serf/downloads/list
-version_link '[.]tar[.][a-z0-9]+$'
-process 'code[.]google[.]com//' ''