diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-04-27 17:31:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-27 17:31:13 -0400 |
| commit | ca6a1a1cafca4b3b6c2892fcff59dc7b2c8a0379 (patch) | |
| tree | 36d679c061d0a71cb709ed00177600db41c4476e | |
| parent | linux: Remove i2c-oops patch (diff) | |
| parent | bind: apply atomics to refcount patch (diff) | |
| download | nixpkgs-ca6a1a1cafca4b3b6c2892fcff59dc7b2c8a0379.tar.gz | |
Merge pull request #60342 from andir/18.09/bind
[18.09] bind: 9.12.3-P4 -> 9.12.4-P1
| -rw-r--r-- | pkgs/servers/dns/bind/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 0e576fb55fce..0f0bd0812e05 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , perl , libcap, libtool, libxml2, openssl , enablePython ? false, python3 ? null @@ -8,19 +8,29 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.3-P4"; in +let version = "9.12.4-P1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "01pj47z5582rd538dmbzf1msw4jc8j4zr0zx4ciy88r6qr9l80fi"; + sha256 = "1if7zc5gzrfd28csc63v9bjwrc0rgvm1x9yx058946hc5gp5lyp2"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ + [ + # Workaround for missing atomic operations on aarch64. Upstream added the + # below patch after the release. Can probably be dropped with the next + # version. + (fetchpatch { + name = "client-atomics-as-refcount.patch"; + url = https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f.diff; + sha256 = "0sidlab9wcv21751fbq3h9m4wy6hk7frag9ar2jndw8rn3axr2qy"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; nativeBuildInputs = [ perl ]; |