2018-08-20 19:43:41 +01:00
|
|
|
{ lib, python3Packages, stdenv, writeTextDir, substituteAll }:
|
2018-07-29 21:48:24 +01:00
|
|
|
|
|
|
|
python3Packages.buildPythonApplication rec {
|
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
|
|
|
version = "0.46.1";
|
2017-04-26 15:35:11 +01:00
|
|
|
pname = "meson";
|
2015-10-21 06:00:41 +01:00
|
|
|
|
2017-04-26 15:35:11 +01:00
|
|
|
src = python3Packages.fetchPypi {
|
|
|
|
inherit pname version;
|
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
|
|
|
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
|
2015-10-21 06:00:41 +01:00
|
|
|
};
|
|
|
|
|
2017-04-26 15:35:11 +01:00
|
|
|
postFixup = ''
|
|
|
|
pushd $out/bin
|
|
|
|
# undo shell wrapper as meson tools are called with python
|
|
|
|
for i in *; do
|
|
|
|
mv ".$i-wrapped" "$i"
|
|
|
|
done
|
|
|
|
popd
|
|
|
|
'';
|
|
|
|
|
2017-11-09 02:48:26 +00:00
|
|
|
patches = [
|
2018-03-05 05:57:38 +00:00
|
|
|
# Upstream insists on not allowing bindir and other dir options
|
|
|
|
# outside of prefix for some reason:
|
|
|
|
# https://github.com/mesonbuild/meson/issues/2561
|
|
|
|
# We remove the check so multiple outputs can work sanely.
|
|
|
|
./allow-dirs-outside-of-prefix.patch
|
|
|
|
|
2017-11-09 02:48:26 +00:00
|
|
|
# Unlike libtool, vanilla Meson does not pass any information
|
|
|
|
# about the path library will be installed to to g-ir-scanner,
|
|
|
|
# breaking the GIR when path other than ${!outputLib}/lib is used.
|
|
|
|
# We patch Meson to add a --fallback-library-path argument with
|
|
|
|
# library install_dir to g-ir-scanner.
|
|
|
|
./gir-fallback-path.patch
|
|
|
|
|
2018-02-23 00:42:35 +00:00
|
|
|
# In common distributions, RPATH is only needed for internal libraries so
|
|
|
|
# meson removes everything else. With Nix, the locations of libraries
|
|
|
|
# are not as predictable, therefore we need to keep them in the RPATH.
|
|
|
|
# At the moment we are keeping the paths starting with /nix/store.
|
|
|
|
# https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
|
|
|
|
(substituteAll {
|
|
|
|
src = ./fix-rpath.patch;
|
|
|
|
inherit (builtins) storeDir;
|
|
|
|
})
|
|
|
|
];
|
2017-09-25 20:59:11 +01:00
|
|
|
|
2017-10-29 18:42:55 +00:00
|
|
|
setupHook = ./setup-hook.sh;
|
2017-08-27 18:42:21 +01:00
|
|
|
|
2018-02-26 11:33:00 +00:00
|
|
|
crossFile = writeTextDir "cross-file.conf" ''
|
|
|
|
[binaries]
|
2018-07-29 21:48:24 +01:00
|
|
|
c = '${stdenv.cc.targetPrefix}cc'
|
|
|
|
cpp = '${stdenv.cc.targetPrefix}c++'
|
|
|
|
ar = '${stdenv.cc.bintools.targetPrefix}ar'
|
|
|
|
strip = '${stdenv.cc.bintools.targetPrefix}strip'
|
2018-02-26 11:33:00 +00:00
|
|
|
pkgconfig = 'pkg-config'
|
|
|
|
|
|
|
|
[properties]
|
|
|
|
needs_exe_wrapper = true
|
|
|
|
|
|
|
|
[host_machine]
|
2018-08-20 19:43:41 +01:00
|
|
|
system = '${stdenv.targetPlatform.parsed.kernel.name}'
|
|
|
|
cpu_family = '${stdenv.targetPlatform.parsed.cpu.family}'
|
|
|
|
cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
|
|
|
|
endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
|
2018-02-26 11:33:00 +00:00
|
|
|
'';
|
|
|
|
|
2018-03-06 02:29:07 +00:00
|
|
|
# 0.45 update enabled tests but they are failing
|
|
|
|
doCheck = false;
|
|
|
|
# checkInputs = [ ninja pkgconfig ];
|
|
|
|
# checkPhase = "python ./run_project_tests.py";
|
|
|
|
|
2018-07-29 21:48:24 +01:00
|
|
|
inherit (stdenv) cc;
|
|
|
|
|
|
|
|
isCross = stdenv.buildPlatform != stdenv.hostPlatform;
|
2018-02-26 11:33:00 +00:00
|
|
|
|
2016-07-23 21:30:02 +01:00
|
|
|
meta = with lib; {
|
|
|
|
homepage = http://mesonbuild.com;
|
2015-10-24 11:50:15 +01:00
|
|
|
description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
|
2016-07-23 21:30:02 +01:00
|
|
|
license = licenses.asl20;
|
|
|
|
maintainers = with maintainers; [ mbe rasendubi ];
|
|
|
|
platforms = platforms.all;
|
2015-10-21 06:00:41 +01:00
|
|
|
};
|
|
|
|
}
|