mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 09:02:46 +00:00
099c13da1b
* 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 commitf8db20fb3a. 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 commit305ac4dade. (cherry picked from commit273d68eff8) Signed-off-by: Domen Kožar <domen@dev.si>
88 lines
2.4 KiB
Nix
88 lines
2.4 KiB
Nix
{ stdenv, lib, fetchurl
|
|
, perl
|
|
, libcap, libtool, libxml2, openssl
|
|
, enablePython ? false, python3 ? null
|
|
, enableSeccomp ? false, libseccomp ? null, buildPackages
|
|
}:
|
|
|
|
assert enableSeccomp -> libseccomp != null;
|
|
assert enablePython -> python3 != null;
|
|
|
|
let version = "9.12.2"; in
|
|
|
|
stdenv.mkDerivation rec {
|
|
name = "bind-${version}";
|
|
|
|
src = fetchurl {
|
|
url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
|
|
sha256 = "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz";
|
|
};
|
|
|
|
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
|
|
|
patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
|
|
stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
|
|
|
|
nativeBuildInputs = [ perl ];
|
|
buildInputs = [ libtool libxml2 openssl ]
|
|
++ lib.optional stdenv.isLinux libcap
|
|
++ lib.optional enableSeccomp libseccomp
|
|
++ lib.optional enablePython python3;
|
|
|
|
STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase
|
|
|
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
|
|
|
configureFlags = [
|
|
"--localstatedir=/var"
|
|
"--with-libtool"
|
|
"--with-libxml2=${libxml2.dev}"
|
|
"--with-openssl=${openssl.dev}"
|
|
(if enablePython then "--with-python" else "--without-python")
|
|
"--without-atf"
|
|
"--without-dlopen"
|
|
"--without-docbook-xsl"
|
|
"--without-gssapi"
|
|
"--without-idn"
|
|
"--without-idnlib"
|
|
"--without-lmdb"
|
|
"--without-libjson"
|
|
"--without-pkcs11"
|
|
"--without-purify"
|
|
"--with-randomdev=/dev/random"
|
|
"--with-ecdsa"
|
|
"--with-gost"
|
|
"--without-eddsa"
|
|
"--with-aes"
|
|
] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}"
|
|
++ lib.optional enableSeccomp "--enable-seccomp";
|
|
|
|
postInstall = ''
|
|
moveToOutput bin/bind9-config $dev
|
|
moveToOutput bin/isc-config.sh $dev
|
|
|
|
moveToOutput bin/host $host
|
|
|
|
moveToOutput bin/dig $dnsutils
|
|
moveToOutput bin/nslookup $dnsutils
|
|
moveToOutput bin/nsupdate $dnsutils
|
|
|
|
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'
|
|
done
|
|
'';
|
|
|
|
doCheck = false; # requires root and the net
|
|
|
|
meta = {
|
|
homepage = http://www.isc.org/software/bind;
|
|
description = "Domain name server";
|
|
license = stdenv.lib.licenses.mpl20;
|
|
|
|
maintainers = with stdenv.lib.maintainers; [viric peti];
|
|
platforms = with stdenv.lib.platforms; unix;
|
|
|
|
outputsToInstall = [ "out" "dnsutils" "host" ];
|
|
};
|
|
}
|