diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-05-01 03:50:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 03:50:57 +0200 |
| commit | bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d (patch) | |
| tree | c27afa16ec19b666cdd766ecbac973472ecad903 /pkgs/tools | |
| parent | f14021febf9c856e07a561124a1d67b90b5bf057 (diff) | |
| parent | c9fef6230a09bb45e8336c7025ec81bb9089f8b0 (diff) | |
| download | nixlib-bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d.tar nixlib-bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d.tar.gz nixlib-bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d.tar.bz2 nixlib-bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d.tar.lz nixlib-bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d.tar.xz nixlib-bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d.tar.zst nixlib-bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d.zip | |
Merge pull request #86277 from mweinelt/dnsmasq/2.81
dnsmasq: 2.80 → 2.81
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/dnsmasq/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 667eb9feb0c9..055f92141b29 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -12,21 +12,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.80"; + name = "dnsmasq-2.81"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"; + sha256 = "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l"; }; - patches = [ - # Fix build with nettle 3.5 - (fetchpatch { - name = "nettle-3.5.patch"; - url = "thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e"; - sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic"; - }) - ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include <linux/sockios.h>' -i src/dhcp.c ''; |