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, configd, CF, coreutils }:
|
2016-12-29 18:06:50 +00:00
|
|
|
|
|
|
|
with stdenv.lib;
|
|
|
|
|
|
|
|
let
|
|
|
|
|
|
|
|
mkPaths = paths: {
|
|
|
|
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
|
|
|
|
LIBRARY_PATH = makeLibraryPath paths;
|
|
|
|
};
|
|
|
|
|
|
|
|
in
|
|
|
|
|
|
|
|
stdenv.mkDerivation rec {
|
2019-08-15 13:41:18 +01:00
|
|
|
pname = "python-boot";
|
2016-12-29 18:06:50 +00:00
|
|
|
version = "2.7.12";
|
|
|
|
libPrefix = "python2.7";
|
|
|
|
|
|
|
|
src = fetchurl {
|
|
|
|
url = "https://www.python.org/ftp/python/2.7.12/Python-${version}.tar.xz";
|
|
|
|
sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";
|
|
|
|
};
|
|
|
|
|
|
|
|
inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
|
|
|
|
|
|
|
|
LDFLAGS = optionalString (!stdenv.isDarwin) "-lgcc_s";
|
|
|
|
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
|
|
|
|
|
|
|
|
buildInputs = optionals stdenv.isDarwin [ CF configd ];
|
|
|
|
|
|
|
|
patches =
|
|
|
|
[ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
|
|
|
|
./search-path.patch
|
|
|
|
|
|
|
|
# Python recompiles a Python if the mtime stored *in* the
|
|
|
|
# pyc/pyo file differs from the mtime of the source file. This
|
|
|
|
# doesn't work in Nix because Nix changes the mtime of files in
|
|
|
|
# the Nix store to 1. So treat that as a special case.
|
|
|
|
./nix-store-mtime.patch
|
|
|
|
|
|
|
|
# patch python to put zero timestamp into pyc
|
|
|
|
# if DETERMINISTIC_BUILD env var is set
|
|
|
|
./deterministic-build.patch
|
|
|
|
];
|
|
|
|
|
2018-09-09 18:36:05 +01:00
|
|
|
# Hack hack hack to stop shit from failing from a missing _scproxy on Darwin. Since
|
|
|
|
# we only use this python for bootstrappy things, it doesn't really matter if it
|
|
|
|
# doesn't have perfect proxy support in urllib :) this just makes it fall back on env
|
|
|
|
# vars instead of attempting to read the proxy configuration automatically, so not a
|
|
|
|
# huge loss even if for whatever reason we did want proxy support.
|
|
|
|
postPatch = ''
|
|
|
|
substituteInPlace Lib/urllib.py --replace "if sys.platform == 'darwin'" "if False"
|
|
|
|
'';
|
|
|
|
|
2016-12-29 18:06:50 +00:00
|
|
|
DETERMINISTIC_BUILD = 1;
|
|
|
|
|
|
|
|
preConfigure = ''
|
|
|
|
# Purity.
|
|
|
|
for i in /usr /sw /opt /pkg; do
|
|
|
|
substituteInPlace ./setup.py --replace $i /no-such-path
|
|
|
|
done
|
|
|
|
'' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
|
|
|
|
for i in Lib/plat-*/regen; do
|
|
|
|
substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
|
|
|
|
done
|
|
|
|
'' + optionalString stdenv.isDarwin ''
|
|
|
|
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
|
|
|
|
substituteInPlace Lib/multiprocessing/__init__.py \
|
|
|
|
--replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
|
|
|
|
'';
|
|
|
|
|
|
|
|
configureFlags = [ "--enable-shared" "--with-threads" "--enable-unicode=ucs4" ]
|
|
|
|
++ optionals stdenv.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" ]
|
|
|
|
++ optionals stdenv.isDarwin [ "--disable-toolbox-glue" ];
|
|
|
|
|
|
|
|
postInstall =
|
|
|
|
''
|
|
|
|
ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
|
|
|
|
|
|
|
|
rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
|
|
|
|
'';
|
|
|
|
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
|
2018-07-27 20:38:42 +01:00
|
|
|
passthru.pkgs = builtins.throw "python-boot does not support packages, this package is only intended for bootstrapping." {};
|
|
|
|
|
2016-12-29 18:06:50 +00:00
|
|
|
meta = {
|
2017-08-01 21:03:30 +01:00
|
|
|
homepage = http://python.org;
|
2016-12-29 18:06:50 +00:00
|
|
|
description = "A high-level dynamically-typed programming language";
|
|
|
|
longDescription = ''
|
|
|
|
Python is a remarkably powerful dynamic programming language that
|
|
|
|
is used in a wide variety of application domains. Some of its key
|
|
|
|
distinguishing features include: clear, readable syntax; strong
|
|
|
|
introspection capabilities; intuitive object orientation; natural
|
|
|
|
expression of procedural code; full modularity, supporting
|
|
|
|
hierarchical packages; exception-based error handling; and very
|
|
|
|
high level dynamic data types.
|
|
|
|
'';
|
|
|
|
license = stdenv.lib.licenses.psfl;
|
|
|
|
platforms = stdenv.lib.platforms.all;
|
2019-02-22 15:14:13 +00:00
|
|
|
maintainers = with stdenv.lib.maintainers; [ lnl7 domenkozar ];
|
2016-12-29 18:06:50 +00:00
|
|
|
};
|
|
|
|
}
|