diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
| commit | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (patch) | |
| tree | 25f168400b9192ca94a7bdb0bb19ce11f03db509 /pkgs/tools/networking/keepalived/default.nix | |
| parent | 82bd3b0cbfb0af1555ed5b6b6f4edf2b6b17a144 (diff) | |
| parent | be90b35b9efbd7baaa80f367ffc41609531a8fe2 (diff) | |
| download | nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.gz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.bz2 nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.lz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.xz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.zst nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.zip | |
Merge remote-tracking branch 'nixpkgs/master' into spectrum
Diffstat (limited to 'pkgs/tools/networking/keepalived/default.nix')
| -rw-r--r-- | pkgs/tools/networking/keepalived/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 4e1894db98c..87748211425 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,32 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: +{ stdenv, fetchFromGitHub, nixosTests +, libnfnetlink, libnl, net-snmp, openssl +, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { pname = "keepalived"; - version = "1.4.5"; + version = "2.0.19"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "12r80rcfxrys826flaqcdlfhcr7q4ccsd62ra1svy9545vf02qmx"; + sha256 = "05jgr0f04z69x3zf3b9z04wczl15fnh69bs6j0yw55fij1k9nj4d"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-19115.patch"; - url = "https://github.com/acassen/keepalived/pull/961/commits/f28015671a4b04785859d1b4b1327b367b6a10e9.patch"; - sha256 = "1jnwk7x4qdgv7fb4jzw6sihv62n8wv04myhgwm2vxn8nfkcgd1mm"; - }) - ]; - buildInputs = [ libnfnetlink libnl - net_snmp + net-snmp openssl ]; - nativeBuildInputs = [ pkgconfig ]; + passthru.tests.keepalived = nixosTests.keepalived; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; configureFlags = [ "--enable-sha1" |