diff options
| author | Remy Goldschmidt <taktoa@gmail.com> | 2015-03-26 14:32:37 -0400 |
|---|---|---|
| committer | Remy Goldschmidt <taktoa@gmail.com> | 2015-03-26 16:19:55 -0400 |
| commit | eb54c42ffaf44b7504fcca79f433ccdbae739741 (patch) | |
| tree | ba8c55e368bf1b10bb29ad1de7e2a026562a89a4 /pkgs/tools | |
| parent | f6d223c7736f9dc9def8a640b487bb68eafc0665 (diff) | |
| download | nixlib-eb54c42ffaf44b7504fcca79f433ccdbae739741.tar nixlib-eb54c42ffaf44b7504fcca79f433ccdbae739741.tar.gz nixlib-eb54c42ffaf44b7504fcca79f433ccdbae739741.tar.bz2 nixlib-eb54c42ffaf44b7504fcca79f433ccdbae739741.tar.lz nixlib-eb54c42ffaf44b7504fcca79f433ccdbae739741.tar.xz nixlib-eb54c42ffaf44b7504fcca79f433ccdbae739741.tar.zst nixlib-eb54c42ffaf44b7504fcca79f433ccdbae739741.zip | |
Clean up HAProxy nix expression
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 66a4e7536468..9a7d05d79bf3 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; }; } |