From f6d223c7736f9dc9def8a640b487bb68eafc0665 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Thu, 26 Mar 2015 14:29:10 -0400
Subject: [PATCH 1/3] Add SSL support to HAProxy

---
 pkgs/tools/networking/haproxy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 58e238c3c02..66a4e753646 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl }:
+{ stdenv, pkgs, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
   version = "1.5.11";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb";
   };
 
-  buildInputs = [ ];
+  buildInputs = [ openssl ];
 
   # TODO: make it work on darwin/bsd as well
   preConfigure = ''
-    export makeFlags="TARGET=linux2628 PREFIX=$out"
+    export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes"
   '';
 
   meta = {

From eb54c42ffaf44b7504fcca79f433ccdbae739741 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Thu, 26 Mar 2015 14:32:37 -0400
Subject: [PATCH 2/3] Clean up HAProxy nix expression

---
 pkgs/tools/networking/haproxy/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 66a4e753646..9a7d05d79bf 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,11 +1,12 @@
 { stdenv, pkgs, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.11";
+  major-version = "1.5";
+  version = "${major-version}.11";
   name = "haproxy-${version}";
 
   src = fetchurl {
-    url = "http://haproxy.1wt.eu/download/1.5/src/${name}.tar.gz";
+    url = "http://haproxy.1wt.eu/download/${major-version}/src/${name}.tar.gz";
     sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb";
   };
 
@@ -29,9 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://haproxy.1wt.eu;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     platforms = stdenv.lib.platforms.linux;
-    /* TODO license = [
-       stdenv.lib.licenses.gpl2
-       stdenv.lib.licenses.lgpl21
-    ];*/
+    license = stdenv.lib.licenses.gpl2;
   };
 }

From ab2cb8593091984bbd985836f0d0d52b4e1dc043 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Thu, 26 Mar 2015 16:21:15 -0400
Subject: [PATCH 3/3] Fixed case in HAProxy nix expr

---
 pkgs/tools/networking/haproxy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 9a7d05d79bf..4119afa5228 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,12 +1,12 @@
 { stdenv, pkgs, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  major-version = "1.5";
-  version = "${major-version}.11";
+  majorVersion = "1.5";
+  version = "${majorVersion}.11";
   name = "haproxy-${version}";
 
   src = fetchurl {
-    url = "http://haproxy.1wt.eu/download/${major-version}/src/${name}.tar.gz";
+    url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz";
     sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb";
   };