From bf540904debdfed09ff36ffd1f6f3280af253aee Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 03:36:15 +0200
Subject: [PATCH] haproxy: update to 1.4.24 (set platform to linux, for now)

---
 pkgs/tools/networking/haproxy/default.nix | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 0a43251dc350..3d2c26b6df53 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, fetchurl }:
+{ stdenv, pkgs, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "haproxy-1.4.20";
+stdenv.mkDerivation rec {
+  version = "1.4.24";
+  name = "haproxy-${version}";
   
   src = fetchurl {
-    url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz;
-    sha256 = "0gi81dg8k3ypljs7ifbppvpfrwrnbafjv41fjpwnyqfwbxa4j2gh";
+    url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz";
+    sha256 = "1vy7jz7l8qdd6ah3y65zarz9x9pf3bs02icxnrckpgh1s3s2h2b8";
   };
 
-  buildInputs = [];
+  buildInputs = [ ];
 
+  # TODO: make it work on darwin/bsd as well
   preConfigure = ''
-    export makeFlags="TARGET=linux26 PREFIX=$out"
+    export makeFlags="TARGET=linux2628 PREFIX=$out"
   '';
-  
+
   meta = {
     description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications.";
-    homepage = http://haproxy.1wt.eu/;
+    homepage = "http://haproxy.1wt.eu";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    platforms = stdenv.lib.platforms.linux;
+    license = [
+       pkgs.lib.licenses.gpl2
+       pkgs.lib.licenses.lgpl21
+    ];
   };
 }