diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:23:58 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:23:58 +0200 |
| commit | d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e (patch) | |
| tree | 5784b50b228af73cb482abbc7d8eea42fcfc12e3 /pkgs | |
| parent | 083b0ba631d56c3b60eb90ba2b81977e17704085 (diff) | |
| parent | bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d (diff) | |
| download | nixpkgs-d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e.tar nixpkgs-d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e.tar.gz nixpkgs-d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e.tar.bz2 nixpkgs-d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e.tar.lz nixpkgs-d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e.tar.xz nixpkgs-d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e.tar.zst nixpkgs-d09c1bc5b3b16174f4a4be5ea4aaa776cd1c0b0e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
| -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 667eb9feb0c..055f92141b2 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 ''; |