diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-04 20:06:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 20:06:48 +0000 |
| commit | 73774ef8f9cd496162e53d8a4b1f06b382af21c9 (patch) | |
| tree | 571cf4c84ce00ee2f243913dc9a22924f8589ba2 /pkgs/tools | |
| parent | 75d4499e6945aa046ad82c94261644db5b008a77 (diff) | |
| parent | 1f7fdf6fef0ca3871b9563a782bd2d64ce22919e (diff) | |
| download | nixlib-73774ef8f9cd496162e53d8a4b1f06b382af21c9.tar nixlib-73774ef8f9cd496162e53d8a4b1f06b382af21c9.tar.gz nixlib-73774ef8f9cd496162e53d8a4b1f06b382af21c9.tar.bz2 nixlib-73774ef8f9cd496162e53d8a4b1f06b382af21c9.tar.lz nixlib-73774ef8f9cd496162e53d8a4b1f06b382af21c9.tar.xz nixlib-73774ef8f9cd496162e53d8a4b1f06b382af21c9.tar.zst nixlib-73774ef8f9cd496162e53d8a4b1f06b382af21c9.zip | |
Merge pull request #36168 from ryantm/majorminor
a single version attribute for expressions previously using "majorVersion"
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 06c595f7c6d4..d31d560e8680 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -9,13 +9,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - majorVersion = "1.7"; - minorVersion = "9"; - version = "${majorVersion}.${minorVersion}"; + version = "1.7.9"; name = "${pname}-${version}"; src = fetchurl { - url = "https://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz"; + url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; sha256 = "1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e"; }; |