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 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>
97 lines
3.9 KiB
Nix
97 lines
3.9 KiB
Nix
{ stdenv, fetchurl, fetchpatch
|
|
, buildPlatform, hostPlatform, autoreconfHook
|
|
|
|
# libffi is used in darwin stdenv
|
|
# we cannot run checks within it
|
|
, doCheck ? !stdenv.isDarwin, dejagnu
|
|
}:
|
|
|
|
stdenv.mkDerivation rec {
|
|
name = "libffi-3.2.1";
|
|
|
|
src = fetchurl {
|
|
url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
|
|
sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
|
|
};
|
|
|
|
patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch
|
|
++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
|
|
url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch;
|
|
sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc";
|
|
})
|
|
++ stdenv.lib.optional hostPlatform.isMusl (fetchpatch {
|
|
name = "gnu-linux-define.patch";
|
|
url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580";
|
|
sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2";
|
|
})
|
|
++ stdenv.lib.optional hostPlatform.isRiscV (fetchpatch {
|
|
name = "riscv-support.patch";
|
|
url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch;
|
|
sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y";
|
|
})
|
|
++ stdenv.lib.optionals stdenv.isMips [
|
|
(fetchpatch {
|
|
name = "0001-mips-Use-compiler-internal-define-for-linux.patch";
|
|
url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";
|
|
sha256 = "1gc53lw90p6hc0cmhj3csrwincfz7va5ss995ksw5gm0yrr9mrvb";
|
|
})
|
|
(fetchpatch {
|
|
name = "0001-mips-fix-MIPS-softfloat-build-issue.patch";
|
|
url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";
|
|
sha256 = "0l8xgdciqalg4z9rcwyk87h8fdxpfv4hfqxwsy2agpnpszl5jjdq";
|
|
})
|
|
];
|
|
|
|
outputs = [ "out" "dev" "man" "info" ];
|
|
|
|
nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook;
|
|
|
|
configureFlags = [
|
|
"--with-gcc-arch=generic" # no detection of -march= or -mtune=
|
|
"--enable-pax_emutramp"
|
|
];
|
|
|
|
preCheck = ''
|
|
# The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE.
|
|
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
|
|
'';
|
|
|
|
checkInputs = [ dejagnu ];
|
|
|
|
inherit doCheck;
|
|
|
|
dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.
|
|
|
|
# Install headers and libs in the right places.
|
|
postFixup = ''
|
|
mkdir -p "$dev/"
|
|
mv "$out/lib/${name}/include" "$dev/include"
|
|
rmdir "$out/lib/${name}"
|
|
substituteInPlace "$dev/lib/pkgconfig/libffi.pc" \
|
|
--replace 'includedir=''${libdir}/libffi-3.2.1' "includedir=$dev"
|
|
'';
|
|
|
|
meta = with stdenv.lib; {
|
|
description = "A foreign function call interface library";
|
|
longDescription = ''
|
|
The libffi library provides a portable, high level programming
|
|
interface to various calling conventions. This allows a
|
|
programmer to call any function specified by a call interface
|
|
description at run-time.
|
|
|
|
FFI stands for Foreign Function Interface. A foreign function
|
|
interface is the popular name for the interface that allows code
|
|
written in one language to call code written in another
|
|
language. The libffi library really only provides the lowest,
|
|
machine dependent layer of a fully featured foreign function
|
|
interface. A layer must exist above libffi that handles type
|
|
conversions for values passed between the two languages.
|
|
'';
|
|
homepage = http://sourceware.org/libffi/;
|
|
# See http://github.com/atgreen/libffi/blob/master/LICENSE .
|
|
license = licenses.free;
|
|
maintainers = [ ];
|
|
platforms = platforms.all;
|
|
};
|
|
}
|