diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:31:29 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:31:29 -0700 |
| commit | e78b94199f7b772d8fce079383c835d9da498310 (patch) | |
| tree | 506e641aacf9cc62eb4c71f618798b94285c6162 /pkgs/tools | |
| parent | 66adf64bae4f795bd1e9db716b28316b4ecc05a7 (diff) | |
| parent | ab2cb8593091984bbd985836f0d0d52b4e1dc043 (diff) | |
| download | nixlib-e78b94199f7b772d8fce079383c835d9da498310.tar nixlib-e78b94199f7b772d8fce079383c835d9da498310.tar.gz nixlib-e78b94199f7b772d8fce079383c835d9da498310.tar.bz2 nixlib-e78b94199f7b772d8fce079383c835d9da498310.tar.lz nixlib-e78b94199f7b772d8fce079383c835d9da498310.tar.xz nixlib-e78b94199f7b772d8fce079383c835d9da498310.tar.zst nixlib-e78b94199f7b772d8fce079383c835d9da498310.zip | |
Merge pull request #7011 from taktoa/master
Add SSL support to HAProxy
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 58e238c3c025..4119afa5228a 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,19 +1,20 @@ -{ stdenv, pkgs, fetchurl }: +{ stdenv, pkgs, fetchurl, openssl }: stdenv.mkDerivation rec { - version = "1.5.11"; + majorVersion = "1.5"; + version = "${majorVersion}.11"; name = "haproxy-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/1.5/src/${name}.tar.gz"; + url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz"; 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 = { @@ -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; }; } |