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 15:04:48 +01:00
|
|
|
{ stdenv, fetchurl, fetchpatch
|
2018-08-20 19:43:41 +01:00
|
|
|
, autoreconfHook
|
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 15:04:48 +01:00
|
|
|
|
|
|
|
# libffi is used in darwin stdenv
|
|
|
|
# we cannot run checks within it
|
|
|
|
, doCheck ? !stdenv.isDarwin, dejagnu
|
2017-06-28 21:13:56 +01:00
|
|
|
}:
|
2008-04-09 08:40:48 +01:00
|
|
|
|
2013-09-03 21:08:59 +01:00
|
|
|
stdenv.mkDerivation rec {
|
2015-03-26 23:12:24 +00:00
|
|
|
name = "libffi-3.2.1";
|
2010-01-29 11:40:39 +00:00
|
|
|
|
2008-04-09 08:40:48 +01:00
|
|
|
src = fetchurl {
|
|
|
|
url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
|
2015-03-26 23:12:24 +00:00
|
|
|
sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
|
2008-04-09 08:40:48 +01:00
|
|
|
};
|
|
|
|
|
2018-01-13 02:08:58 +00:00
|
|
|
patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch
|
|
|
|
++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
|
2017-09-15 21:55:50 +01:00
|
|
|
url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch;
|
|
|
|
sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc";
|
2018-01-13 02:08:58 +00:00
|
|
|
})
|
2018-08-20 19:43:41 +01:00
|
|
|
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
|
2018-01-13 02:08:58 +00:00
|
|
|
name = "gnu-linux-define.patch";
|
|
|
|
url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580";
|
|
|
|
sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2";
|
|
|
|
})
|
2018-08-20 19:43:41 +01:00
|
|
|
++ stdenv.lib.optional stdenv.hostPlatform.isRiscV (fetchpatch {
|
2018-02-24 22:59:00 +00:00
|
|
|
name = "riscv-support.patch";
|
|
|
|
url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch;
|
|
|
|
sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y";
|
|
|
|
})
|
2018-01-13 02:08:58 +00:00
|
|
|
++ 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";
|
|
|
|
})
|
|
|
|
];
|
2014-08-27 00:14:09 +01:00
|
|
|
|
2017-07-11 10:14:14 +01:00
|
|
|
outputs = [ "out" "dev" "man" "info" ];
|
2013-09-03 21:08:59 +01:00
|
|
|
|
2018-08-20 19:43:41 +01:00
|
|
|
nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isRiscV autoreconfHook;
|
2018-02-24 22:59:00 +00:00
|
|
|
|
2014-03-17 17:52:16 +00:00
|
|
|
configureFlags = [
|
|
|
|
"--with-gcc-arch=generic" # no detection of -march= or -mtune=
|
2015-03-26 23:12:24 +00:00
|
|
|
"--enable-pax_emutramp"
|
|
|
|
];
|
2013-09-03 21:08:59 +01:00
|
|
|
|
2018-05-30 03:00:06 +01:00
|
|
|
preCheck = ''
|
|
|
|
# The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE.
|
|
|
|
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
|
|
|
|
'';
|
|
|
|
|
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 15:04:48 +01:00
|
|
|
checkInputs = [ dejagnu ];
|
|
|
|
|
2015-09-24 10:28:20 +01:00
|
|
|
inherit doCheck;
|
|
|
|
|
2018-08-20 19:43:41 +01:00
|
|
|
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
|
2013-09-03 21:08:59 +01:00
|
|
|
|
2015-04-18 10:00:58 +01:00
|
|
|
# Install headers and libs in the right places.
|
2015-10-03 16:07:49 +01:00
|
|
|
postFixup = ''
|
2015-04-18 10:00:58 +01:00
|
|
|
mkdir -p "$dev/"
|
|
|
|
mv "$out/lib/${name}/include" "$dev/include"
|
|
|
|
rmdir "$out/lib/${name}"
|
2015-10-03 16:07:49 +01:00
|
|
|
substituteInPlace "$dev/lib/pkgconfig/libffi.pc" \
|
|
|
|
--replace 'includedir=''${libdir}/libffi-3.2.1' "includedir=$dev"
|
2015-02-25 03:15:51 +00:00
|
|
|
'';
|
2012-01-16 23:36:05 +00:00
|
|
|
|
2015-10-03 16:07:49 +01:00
|
|
|
meta = with stdenv.lib; {
|
2013-09-03 21:08:59 +01:00
|
|
|
description = "A foreign function call interface library";
|
2008-04-09 08:40:48 +01:00
|
|
|
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.
|
|
|
|
'';
|
2013-09-03 21:08:59 +01:00
|
|
|
homepage = http://sourceware.org/libffi/;
|
2010-01-29 11:40:39 +00:00
|
|
|
# See http://github.com/atgreen/libffi/blob/master/LICENSE .
|
2015-10-03 16:07:49 +01:00
|
|
|
license = licenses.free;
|
2015-01-13 21:33:24 +00:00
|
|
|
maintainers = [ ];
|
2015-10-03 16:07:49 +01:00
|
|
|
platforms = platforms.all;
|
2008-04-09 08:40:48 +01:00
|
|
|
};
|
|
|
|
}
|