Frederik Rietdijk 099c13da1b 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 f8db20fb3a. 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 305ac4dade. (cherry picked from commit 273d68eff8) Signed-off-by: Domen Kožar <domen@dev.si>		2018-07-24 15:04:48 +01:00
..
catch_conflicts	python: Move catch_conflicts.py into subdirectory (#23600)	2017-04-01 12:22:36 +02:00
cpython	Merge staging-next into master (#44009)	2018-07-24 15:04:48 +01:00
pypy/2.7	pkgs/*: remove unreferenced function arguments	2018-07-21 02:48:04 +00:00
build-python-package-common.nix	buildPythonPackage: install builds reproducibly	2016-12-13 14:45:05 +01:00
build-python-package-flit.nix	python: flit: 0.13 -> 1.0	2018-04-08 11:36:07 +02:00
build-python-package-setuptools.nix	buildPythonPackage: rename nix_run_setup.py to nix_run_setup	2018-01-20 13:31:14 +01:00
build-python-package-wheel.nix	buildPythonPackage: refactor	2016-12-05 10:29:22 +01:00
build-python-package.nix	buildPythonPackage: use config.doCheckByDefault	2018-04-26 20:15:52 +00:00
mk-python-derivation.nix	stdenv: steal checkInputs from buildPythonPackage	2018-04-26 20:22:51 +00:00
run_setup.py	Python: move python-modules/generic to interpreter folder	2016-09-01 16:16:31 +02:00
setup-hook.nix	Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook	2017-05-19 16:28:11 +02:00
setup-hook.sh	Merge pull request #26805 from obsidiansystems/cross-elegant	2017-12-30 22:58:02 -05:00
with-packages.nix	python: add python.withPackages function	2016-05-29 15:12:23 +02:00
wrap-python.nix	Python: script names now include full path	2017-01-02 11:29:11 +01:00
wrap.sh	stdenv setup: Always use both propagated files	2017-11-21 10:44:44 -05:00
wrapper.nix	python.buildEnv: always include the $out output	2017-12-10 15:21:35 +01:00