2018-06-10 01:43:13 +02:00
|
|
|
{ stdenv, lib, fetchurl
|
|
|
|
, perl
|
|
|
|
, libcap, libtool, libxml2, openssl
|
2018-04-21 21:48:30 +02:00
|
|
|
, enablePython ? false, python3 ? null
|
2018-02-27 23:27:48 +01:00
|
|
|
, enableSeccomp ? false, libseccomp ? null, buildPackages
|
|
|
|
}:
|
2017-05-09 18:10:06 +02:00
|
|
|
|
|
|
|
assert enableSeccomp -> libseccomp != null;
|
2017-11-17 14:03:30 +01:00
|
|
|
assert enablePython -> python3 != null;
|
2011-01-07 12:33:04 +01:00
|
|
|
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 16:04:48 +02:00
|
|
|
let version = "9.12.2"; in
|
2012-10-02 17:48:54 +02:00
|
|
|
|
2011-01-07 12:33:04 +01:00
|
|
|
stdenv.mkDerivation rec {
|
2015-06-01 21:35:41 +02:00
|
|
|
name = "bind-${version}";
|
2011-01-07 12:33:04 +01:00
|
|
|
|
|
|
|
src = fetchurl {
|
2018-06-28 20:43:35 +02:00
|
|
|
url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 16:04:48 +02:00
|
|
|
sha256 = "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz";
|
2011-01-07 12:33:04 +01:00
|
|
|
};
|
|
|
|
|
2017-01-05 19:58:26 +01:00
|
|
|
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
2015-10-30 22:12:29 +01:00
|
|
|
|
|
|
|
patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
|
2016-05-13 00:29:30 +02:00
|
|
|
stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
|
2015-11-28 19:26:59 +01:00
|
|
|
|
2018-01-09 23:54:08 +01:00
|
|
|
nativeBuildInputs = [ perl ];
|
2018-06-11 02:04:29 +02:00
|
|
|
buildInputs = [ libtool libxml2 openssl ]
|
|
|
|
++ lib.optional stdenv.isLinux libcap
|
2017-11-15 15:33:30 +01:00
|
|
|
++ lib.optional enableSeccomp libseccomp
|
2017-11-17 14:03:30 +01:00
|
|
|
++ lib.optional enablePython python3;
|
2011-01-07 12:33:04 +01:00
|
|
|
|
2017-02-19 12:11:52 +01:00
|
|
|
STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase
|
|
|
|
|
2018-02-27 23:27:48 +01:00
|
|
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
|
|
|
|
2013-06-09 19:25:46 +02:00
|
|
|
configureFlags = [
|
2015-06-01 21:35:51 +02:00
|
|
|
"--localstatedir=/var"
|
|
|
|
"--with-libtool"
|
2016-08-30 01:57:21 +02:00
|
|
|
"--with-libxml2=${libxml2.dev}"
|
2016-04-16 19:44:32 +02:00
|
|
|
"--with-openssl=${openssl.dev}"
|
2017-11-15 15:33:30 +01:00
|
|
|
(if enablePython then "--with-python" else "--without-python")
|
2015-06-01 21:35:51 +02:00
|
|
|
"--without-atf"
|
|
|
|
"--without-dlopen"
|
|
|
|
"--without-docbook-xsl"
|
|
|
|
"--without-gssapi"
|
|
|
|
"--without-idn"
|
|
|
|
"--without-idnlib"
|
2017-12-21 21:07:22 +01:00
|
|
|
"--without-lmdb"
|
2018-06-10 01:43:13 +02:00
|
|
|
"--without-libjson"
|
2015-06-01 21:35:51 +02:00
|
|
|
"--without-pkcs11"
|
|
|
|
"--without-purify"
|
2018-02-27 23:27:48 +01:00
|
|
|
"--with-randomdev=/dev/random"
|
|
|
|
"--with-ecdsa"
|
|
|
|
"--with-gost"
|
|
|
|
"--without-eddsa"
|
|
|
|
"--with-aes"
|
2018-06-11 02:04:29 +02:00
|
|
|
] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}"
|
|
|
|
++ lib.optional enableSeccomp "--enable-seccomp";
|
2012-10-02 17:48:54 +02:00
|
|
|
|
2015-10-30 22:12:29 +01:00
|
|
|
postInstall = ''
|
|
|
|
moveToOutput bin/bind9-config $dev
|
|
|
|
moveToOutput bin/isc-config.sh $dev
|
2016-05-18 22:05:51 +02:00
|
|
|
|
2016-10-08 16:01:15 +02:00
|
|
|
moveToOutput bin/host $host
|
|
|
|
|
|
|
|
moveToOutput bin/dig $dnsutils
|
|
|
|
moveToOutput bin/nslookup $dnsutils
|
|
|
|
moveToOutput bin/nsupdate $dnsutils
|
|
|
|
|
2016-12-08 18:50:07 +01:00
|
|
|
for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do
|
|
|
|
sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'
|
2016-05-18 22:05:51 +02:00
|
|
|
done
|
2015-10-30 22:12:29 +01:00
|
|
|
'';
|
|
|
|
|
2018-04-25 05:20:18 +02:00
|
|
|
doCheck = false; # requires root and the net
|
|
|
|
|
2011-01-07 12:33:04 +01:00
|
|
|
meta = {
|
2017-08-01 22:03:30 +02:00
|
|
|
homepage = http://www.isc.org/software/bind;
|
2014-08-24 16:21:08 +02:00
|
|
|
description = "Domain name server";
|
2018-01-17 02:39:20 +01:00
|
|
|
license = stdenv.lib.licenses.mpl20;
|
2015-06-01 21:35:51 +02:00
|
|
|
|
2018-07-22 21:50:19 +02:00
|
|
|
maintainers = with stdenv.lib.maintainers; [peti];
|
2015-06-01 21:35:51 +02:00
|
|
|
platforms = with stdenv.lib.platforms; unix;
|
2017-01-05 19:58:26 +01:00
|
|
|
|
|
|
|
outputsToInstall = [ "out" "dnsutils" "host" ];
|
2011-01-07 12:33:04 +01:00
|
|
|
};
|
|
|
|
}
|