2016-12-16 14:22:02 +01:00
|
|
|
{ lib
|
2016-12-24 19:55:11 +01:00
|
|
|
, localSystem, crossSystem, config, overlays
|
2016-01-04 03:47:09 +01:00
|
|
|
|
|
|
|
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
|
|
|
|
, bootstrapFiles ? let
|
|
|
|
fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
|
2017-11-14 03:03:43 +01:00
|
|
|
url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/d5bdfcbfe6346761a332918a267e82799ec954d2/${file}";
|
2016-12-24 19:55:11 +01:00
|
|
|
inherit (localSystem) system;
|
|
|
|
inherit sha256 executable;
|
2016-01-04 03:47:09 +01:00
|
|
|
}; in {
|
2017-11-14 03:03:43 +01:00
|
|
|
sh = fetch { file = "sh"; sha256 = "07wm33f1yzfpcd3rh42f8g096k4cvv7g65p968j28agzmm2s7s8m"; };
|
|
|
|
bzip2 = fetch { file = "bzip2"; sha256 = "0y9ri2aprkrp2dkzm6229l0mw4rxr2jy7vvh3d8mxv2698v2kdbm"; };
|
|
|
|
mkdir = fetch { file = "mkdir"; sha256 = "0sb07xpy66ws6f2jfnpjibyimzb71al8n8c6y4nr8h50al3g90nr"; };
|
|
|
|
cpio = fetch { file = "cpio"; sha256 = "0r5c54hg678w7zydx27bzl9p3v9fs25y5ix6vdfi1ilqim7xh65n"; };
|
|
|
|
tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "18hp5w6klr8g307ap4368r255qpzg9r0vwg9vqvj8f2zy1xilcjf"; executable = false; };
|
2016-01-04 03:47:09 +01:00
|
|
|
}
|
2015-06-18 19:03:32 +02:00
|
|
|
}:
|
|
|
|
|
2016-12-01 00:51:13 +01:00
|
|
|
assert crossSystem == null;
|
|
|
|
|
2015-06-18 19:03:32 +02:00
|
|
|
let
|
2016-12-24 19:55:11 +01:00
|
|
|
inherit (localSystem) system platform;
|
|
|
|
|
2017-11-14 16:36:04 +01:00
|
|
|
commonImpureHostDeps = [
|
|
|
|
"/bin/sh"
|
|
|
|
"/usr/lib/libSystem.B.dylib"
|
2017-11-14 21:13:31 +01:00
|
|
|
"/usr/lib/system/libunc.dylib" # This dependency is "hidden", so our scanning code doesn't pick it up
|
2017-11-14 16:36:04 +01:00
|
|
|
];
|
2015-06-18 19:03:32 +02:00
|
|
|
in rec {
|
|
|
|
commonPreHook = ''
|
2016-02-29 12:10:26 +01:00
|
|
|
export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
|
2016-03-15 17:35:07 +01:00
|
|
|
export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
|
2015-06-18 19:03:32 +02:00
|
|
|
export NIX_IGNORE_LD_THROUGH_GCC=1
|
|
|
|
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
|
2016-10-17 02:47:43 +02:00
|
|
|
export MACOSX_DEPLOYMENT_TARGET=10.10
|
2015-06-18 19:03:32 +02:00
|
|
|
export SDKROOT=
|
|
|
|
export CMAKE_OSX_ARCHITECTURES=x86_64
|
2015-10-06 09:11:00 +02:00
|
|
|
# Workaround for https://openradar.appspot.com/22671534 on 10.11.
|
|
|
|
export gl_cv_func_getcwd_abort_bug=no
|
2015-06-18 19:03:32 +02:00
|
|
|
'';
|
|
|
|
|
|
|
|
bootstrapTools = derivation rec {
|
2016-01-04 03:47:09 +01:00
|
|
|
inherit system;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
|
|
|
name = "bootstrap-tools";
|
|
|
|
builder = bootstrapFiles.sh; # Not a filename! Attribute 'sh' on bootstrapFiles
|
|
|
|
args = [ ./unpack-bootstrap-tools.sh ];
|
|
|
|
|
2016-01-04 03:47:09 +01:00
|
|
|
inherit (bootstrapFiles) mkdir bzip2 cpio tarball;
|
2017-07-25 20:25:37 +02:00
|
|
|
reexportedLibrariesFile =
|
|
|
|
../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-11-14 16:36:04 +01:00
|
|
|
__impureHostDeps = commonImpureHostDeps;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2017-07-01 02:27:48 +02:00
|
|
|
stageFun = step: last: {shell ? "${bootstrapTools}/bin/bash",
|
2016-12-19 17:10:47 +01:00
|
|
|
overrides ? (self: super: {}),
|
2015-06-18 19:03:32 +02:00
|
|
|
extraPreHook ? "",
|
2017-08-15 17:30:45 +02:00
|
|
|
extraNativeBuildInputs,
|
2016-03-23 18:11:42 +01:00
|
|
|
extraBuildInputs,
|
2017-12-25 04:00:58 +01:00
|
|
|
libcxx,
|
2015-06-18 19:03:32 +02:00
|
|
|
allowedRequisites ? null}:
|
|
|
|
let
|
2018-02-25 23:03:40 +01:00
|
|
|
name = "bootstrap-stage${toString step}";
|
|
|
|
|
2017-08-26 17:43:30 +02:00
|
|
|
buildPackages = lib.optionalAttrs (last ? stdenv) {
|
|
|
|
inherit (last) stdenv;
|
|
|
|
};
|
|
|
|
|
2018-02-25 23:03:40 +01:00
|
|
|
coreutils = { name = "${name}-coreutils"; outPath = bootstrapTools; };
|
|
|
|
gnugrep = { name = "${name}-gnugrep"; outPath = bootstrapTools; };
|
2017-08-26 17:43:30 +02:00
|
|
|
|
|
|
|
bintools = import ../../build-support/bintools-wrapper {
|
|
|
|
inherit shell;
|
|
|
|
inherit (last) stdenvNoCC;
|
|
|
|
|
|
|
|
nativeTools = false;
|
|
|
|
nativeLibc = false;
|
|
|
|
inherit buildPackages coreutils gnugrep;
|
|
|
|
libc = last.pkgs.darwin.Libsystem;
|
2018-02-25 23:03:40 +01:00
|
|
|
bintools = { name = "${name}-binutils"; outPath = bootstrapTools; };
|
2017-08-26 17:43:30 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
|
|
|
|
inherit shell;
|
|
|
|
inherit (last) stdenvNoCC;
|
|
|
|
|
2017-12-25 04:00:58 +01:00
|
|
|
extraPackages = lib.optional (libcxx != null) libcxx;
|
|
|
|
|
2017-08-26 17:43:30 +02:00
|
|
|
nativeTools = false;
|
2018-02-01 01:00:00 +01:00
|
|
|
propagateDoc = false;
|
2017-08-26 17:43:30 +02:00
|
|
|
nativeLibc = false;
|
|
|
|
inherit buildPackages coreutils gnugrep bintools;
|
|
|
|
libc = last.pkgs.darwin.Libsystem;
|
|
|
|
isClang = true;
|
2018-02-25 23:03:40 +01:00
|
|
|
cc = { name = "${name}-clang"; outPath = bootstrapTools; };
|
2017-08-26 17:43:30 +02:00
|
|
|
};
|
|
|
|
|
2015-06-18 19:03:32 +02:00
|
|
|
thisStdenv = import ../generic {
|
2018-02-25 23:03:40 +01:00
|
|
|
name = "${name}-stdenv-darwin";
|
|
|
|
|
2017-08-15 17:30:45 +02:00
|
|
|
inherit config shell extraNativeBuildInputs extraBuildInputs;
|
2017-06-29 18:06:55 +02:00
|
|
|
allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
|
2017-08-26 17:43:30 +02:00
|
|
|
cc.expand-response-params cc.bintools
|
2017-06-29 18:06:55 +02:00
|
|
|
];
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-07-06 03:47:48 +02:00
|
|
|
buildPlatform = localSystem;
|
|
|
|
hostPlatform = localSystem;
|
|
|
|
targetPlatform = localSystem;
|
|
|
|
|
2017-08-26 17:43:30 +02:00
|
|
|
inherit cc;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-08-26 17:43:30 +02:00
|
|
|
preHook = lib.optionalString (shell == "${bootstrapTools}/bin/bash") ''
|
2015-06-18 19:03:32 +02:00
|
|
|
# Don't patch #!/interpreter because it leads to retained
|
|
|
|
# dependencies on the bootstrapTools in the final stdenv.
|
|
|
|
dontPatchShebangs=1
|
|
|
|
'' + ''
|
|
|
|
${commonPreHook}
|
|
|
|
${extraPreHook}
|
|
|
|
'';
|
2016-03-23 18:11:42 +01:00
|
|
|
initialPath = [ bootstrapTools ];
|
2017-05-22 03:37:16 +02:00
|
|
|
|
2015-06-18 19:03:32 +02:00
|
|
|
fetchurlBoot = import ../../build-support/fetchurl {
|
2018-02-17 19:44:43 +01:00
|
|
|
inherit lib;
|
2018-01-10 00:38:19 +01:00
|
|
|
stdenvNoCC = stage0.stdenv;
|
|
|
|
curl = bootstrapTools;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
# The stdenvs themselves don't use mkDerivation, so I need to specify this here
|
2017-11-14 16:36:04 +01:00
|
|
|
__stdenvImpureHostDeps = commonImpureHostDeps;
|
|
|
|
__extraImpureHostDeps = commonImpureHostDeps;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-07-12 03:54:13 +02:00
|
|
|
extraAttrs = {
|
|
|
|
inherit platform;
|
|
|
|
parent = last;
|
|
|
|
|
|
|
|
# This is used all over the place so I figured I'd just leave it here for now
|
|
|
|
secure-format-patch = ./darwin-secure-format.patch;
|
|
|
|
};
|
2016-12-19 17:10:47 +01:00
|
|
|
overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2016-12-16 14:22:02 +01:00
|
|
|
in {
|
2016-12-24 19:55:11 +01:00
|
|
|
inherit config overlays;
|
2016-12-16 14:22:02 +01:00
|
|
|
stdenv = thisStdenv;
|
|
|
|
};
|
2015-06-18 19:03:32 +02:00
|
|
|
|
|
|
|
stage0 = stageFun 0 null {
|
2016-12-19 17:10:47 +01:00
|
|
|
overrides = self: super: with stage0; rec {
|
|
|
|
darwin = super.darwin // {
|
2015-06-18 19:03:32 +02:00
|
|
|
Libsystem = stdenv.mkDerivation {
|
2018-02-25 23:03:40 +01:00
|
|
|
name = "bootstrap-stage0-Libsystem";
|
2015-06-18 19:03:32 +02:00
|
|
|
buildCommand = ''
|
|
|
|
mkdir -p $out
|
|
|
|
ln -s ${bootstrapTools}/lib $out/lib
|
|
|
|
ln -s ${bootstrapTools}/include-Libsystem $out/include
|
|
|
|
'';
|
|
|
|
};
|
|
|
|
dyld = bootstrapTools;
|
|
|
|
};
|
|
|
|
|
2018-06-14 16:22:33 +02:00
|
|
|
llvmPackages_5 = {
|
|
|
|
libcxx = stdenv.mkDerivation {
|
|
|
|
name = "bootstrap-stage0-libcxx";
|
|
|
|
phases = [ "installPhase" "fixupPhase" ];
|
|
|
|
installPhase = ''
|
|
|
|
mkdir -p $out/lib $out/include
|
|
|
|
ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
|
|
|
|
ln -s ${bootstrapTools}/include/c++ $out/include/c++
|
|
|
|
'';
|
|
|
|
linkCxxAbi = false;
|
|
|
|
setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh;
|
|
|
|
};
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2018-06-14 16:22:33 +02:00
|
|
|
libcxxabi = stdenv.mkDerivation {
|
|
|
|
name = "bootstrap-stage0-libcxxabi";
|
|
|
|
buildCommand = ''
|
|
|
|
mkdir -p $out/lib
|
|
|
|
ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
|
|
|
|
'';
|
|
|
|
};
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2017-08-15 17:30:45 +02:00
|
|
|
extraNativeBuildInputs = [];
|
2015-06-18 19:03:32 +02:00
|
|
|
extraBuildInputs = [];
|
2017-12-25 04:00:58 +01:00
|
|
|
libcxx = null;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
stage1 = prevStage: let
|
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 16:04:48 +02:00
|
|
|
persistent = self: super: with prevStage; {
|
|
|
|
cmake = super.cmake.override {
|
|
|
|
majorVersion = "3.9"; # FIXME: update ApplicationServices patch
|
|
|
|
isBootstrap = true;
|
|
|
|
useSharedLibraries = false;
|
|
|
|
};
|
|
|
|
|
|
|
|
python = super.callPackage ../../development/interpreters/python/cpython/2.7/boot.nix {
|
|
|
|
CF = null; # use CoreFoundation from bootstrap-tools
|
|
|
|
configd = null;
|
|
|
|
};
|
|
|
|
};
|
2017-08-16 22:36:21 +02:00
|
|
|
in with prevStage; stageFun 1 prevStage {
|
2015-06-18 19:03:32 +02:00
|
|
|
extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
|
2017-08-15 17:30:45 +02:00
|
|
|
extraNativeBuildInputs = [];
|
2017-12-25 04:00:58 +01:00
|
|
|
extraBuildInputs = [ ];
|
|
|
|
libcxx = pkgs.libcxx;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
|
|
|
allowedRequisites =
|
|
|
|
[ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
|
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
overrides = persistent;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
stage2 = prevStage: let
|
|
|
|
persistent = self: super: with prevStage; {
|
|
|
|
inherit
|
|
|
|
zlib patchutils m4 scons flex perl bison unifdef unzip openssl python
|
|
|
|
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
|
|
|
|
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
|
|
|
|
findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
darwin = super.darwin // {
|
|
|
|
inherit (darwin)
|
|
|
|
dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
|
|
|
|
};
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
2017-08-16 22:36:21 +02:00
|
|
|
in with prevStage; stageFun 2 prevStage {
|
2015-11-07 02:44:02 +01:00
|
|
|
extraPreHook = ''
|
|
|
|
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
|
|
|
|
'';
|
|
|
|
|
2017-08-15 17:30:45 +02:00
|
|
|
extraNativeBuildInputs = [ pkgs.xz ];
|
2017-12-25 04:00:58 +01:00
|
|
|
extraBuildInputs = [ pkgs.darwin.CF ];
|
|
|
|
libcxx = pkgs.libcxx;
|
2016-03-23 18:11:42 +01:00
|
|
|
|
2015-06-18 19:03:32 +02:00
|
|
|
allowedRequisites =
|
|
|
|
[ bootstrapTools ] ++
|
2017-05-24 01:36:50 +02:00
|
|
|
(with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
|
|
|
|
(with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
overrides = persistent;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
stage3 = prevStage: let
|
|
|
|
persistent = self: super: with prevStage; {
|
|
|
|
inherit
|
|
|
|
patchutils m4 scons flex perl bison unifdef unzip openssl python
|
|
|
|
gettext sharutils libarchive pkg-config groff bash subversion
|
|
|
|
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
|
2018-06-14 16:22:33 +02:00
|
|
|
findfreetype libssh curl cmake autoconf automake libtool cpio;
|
|
|
|
|
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 16:04:48 +02:00
|
|
|
# Avoid pulling in a full python and it's extra dependencies for the llvm/clang builds.
|
|
|
|
libxml2 = super.libxml2.override { pythonSupport = false; };
|
|
|
|
|
2018-06-14 16:22:33 +02:00
|
|
|
llvmPackages_5 = super.llvmPackages_5 // (let
|
|
|
|
libraries = super.llvmPackages_5.libraries.extend (_: _: {
|
|
|
|
inherit (llvmPackages_5) libcxx libcxxabi;
|
|
|
|
});
|
|
|
|
in { inherit libraries; } // libraries);
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
darwin = super.darwin // {
|
|
|
|
inherit (darwin)
|
|
|
|
dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
in with prevStage; stageFun 3 prevStage {
|
2015-06-18 19:03:32 +02:00
|
|
|
shell = "${pkgs.bash}/bin/bash";
|
|
|
|
|
|
|
|
# We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun
|
|
|
|
# enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
|
|
|
|
# and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
|
|
|
|
# patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
|
2017-08-15 17:30:45 +02:00
|
|
|
extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
|
2017-12-25 04:00:58 +01:00
|
|
|
extraBuildInputs = [ pkgs.darwin.CF ];
|
|
|
|
libcxx = pkgs.libcxx;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2015-11-07 02:44:02 +01:00
|
|
|
extraPreHook = ''
|
2016-03-23 18:11:42 +01:00
|
|
|
export PATH=${pkgs.bash}/bin:$PATH
|
2015-11-07 02:44:02 +01:00
|
|
|
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
|
|
|
|
'';
|
|
|
|
|
2015-06-18 19:03:32 +02:00
|
|
|
allowedRequisites =
|
|
|
|
[ bootstrapTools ] ++
|
2017-05-24 01:36:50 +02:00
|
|
|
(with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
|
|
|
|
(with pkgs.darwin; [ dyld ICU Libsystem locale ]);
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
overrides = persistent;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
stage4 = prevStage: let
|
|
|
|
persistent = self: super: with prevStage; {
|
|
|
|
inherit
|
|
|
|
gnumake gzip gnused bzip2 gawk ed xz patch bash
|
2018-06-14 16:22:33 +02:00
|
|
|
ncurses libffi zlib gmp pcre gnugrep
|
2017-08-16 22:36:21 +02:00
|
|
|
coreutils findutils diffutils patchutils;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
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 16:04:48 +02:00
|
|
|
# Hack to make sure we don't link ncurses in bootstrap tools. The proper
|
|
|
|
# solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
|
|
|
|
# quite a sledgehammer just to get the C runtime.
|
|
|
|
gettext = super.gettext.overrideAttrs (drv: {
|
|
|
|
configureFlags = drv.configureFlags ++ [
|
|
|
|
"--disable-curses"
|
|
|
|
];
|
|
|
|
});
|
|
|
|
|
2018-06-14 16:22:33 +02:00
|
|
|
llvmPackages_5 = super.llvmPackages_5 // (let
|
2018-06-14 16:22:33 +02:00
|
|
|
tools = super.llvmPackages_5.tools.extend (llvmSelf: _: {
|
2018-06-18 21:30:39 +02:00
|
|
|
inherit (llvmPackages_5) llvm clang-unwrapped;
|
2018-06-14 16:22:33 +02:00
|
|
|
});
|
2018-06-14 16:22:33 +02:00
|
|
|
libraries = super.llvmPackages_5.libraries.extend (llvmSelf: _: {
|
|
|
|
inherit (llvmPackages_5) libcxx libcxxabi compiler-rt;
|
2018-06-14 16:22:33 +02:00
|
|
|
});
|
|
|
|
in { inherit tools libraries; } // tools // libraries);
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
darwin = super.darwin // {
|
|
|
|
inherit (darwin) dyld Libsystem libiconv locale;
|
|
|
|
};
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
2017-08-16 22:36:21 +02:00
|
|
|
in with prevStage; stageFun 4 prevStage {
|
2015-06-18 19:03:32 +02:00
|
|
|
shell = "${pkgs.bash}/bin/bash";
|
2017-08-15 17:30:45 +02:00
|
|
|
extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
|
2017-12-25 04:00:58 +01:00
|
|
|
extraBuildInputs = [ pkgs.darwin.CF ];
|
|
|
|
libcxx = pkgs.libcxx;
|
|
|
|
|
2015-11-07 02:44:02 +01:00
|
|
|
extraPreHook = ''
|
|
|
|
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
|
|
|
|
'';
|
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 16:04:48 +02:00
|
|
|
overrides = persistent;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
stdenvDarwin = prevStage: let
|
|
|
|
pkgs = prevStage;
|
|
|
|
persistent = self: super: with prevStage; {
|
|
|
|
inherit
|
|
|
|
gnumake gzip gnused bzip2 gawk ed xz patch bash
|
2018-06-14 16:22:33 +02:00
|
|
|
ncurses libffi zlib llvm gmp pcre gnugrep
|
2017-08-16 22:36:21 +02:00
|
|
|
coreutils findutils diffutils patchutils;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2018-06-14 16:22:33 +02:00
|
|
|
llvmPackages_5 = super.llvmPackages_5 // (let
|
2018-06-18 20:47:29 +02:00
|
|
|
tools = super.llvmPackages_5.tools.extend (_: super: {
|
2018-07-27 21:52:50 +02:00
|
|
|
inherit (llvmPackages_5) llvm clang-unwrapped;
|
2018-06-14 16:22:33 +02:00
|
|
|
});
|
|
|
|
libraries = super.llvmPackages_5.libraries.extend (_: _: {
|
2018-06-14 16:22:33 +02:00
|
|
|
inherit (llvmPackages_5) compiler-rt libcxx libcxxabi;
|
2018-06-14 16:22:33 +02:00
|
|
|
});
|
|
|
|
in { inherit tools libraries; } // tools // libraries);
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-08-16 22:36:21 +02:00
|
|
|
darwin = super.darwin // {
|
2017-06-15 20:37:35 +02:00
|
|
|
inherit (darwin) dyld ICU Libsystem libiconv;
|
2018-08-20 20:43:41 +02:00
|
|
|
} // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
|
2018-05-23 07:24:16 +02:00
|
|
|
inherit (darwin) binutils binutils-unwrapped cctools;
|
2017-08-16 22:36:21 +02:00
|
|
|
};
|
2018-08-20 20:43:41 +02:00
|
|
|
} // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
|
2017-08-16 22:36:21 +02:00
|
|
|
# Need to get rid of these when cross-compiling.
|
2018-04-03 18:50:25 +02:00
|
|
|
inherit binutils binutils-unwrapped;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
2017-08-16 22:36:21 +02:00
|
|
|
in import ../generic rec {
|
2018-02-25 23:03:40 +01:00
|
|
|
name = "stdenv-darwin";
|
|
|
|
|
2017-05-22 03:37:16 +02:00
|
|
|
inherit config;
|
2016-12-16 14:22:02 +01:00
|
|
|
inherit (pkgs.stdenv) fetchurlBoot;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-07-06 03:47:48 +02:00
|
|
|
buildPlatform = localSystem;
|
|
|
|
hostPlatform = localSystem;
|
|
|
|
targetPlatform = localSystem;
|
|
|
|
|
2015-11-13 03:59:17 +01:00
|
|
|
preHook = commonPreHook + ''
|
2017-07-21 20:29:18 +02:00
|
|
|
export NIX_COREFOUNDATION_RPATH=${pkgs.darwin.CF}/Library/Frameworks
|
2015-11-13 03:59:17 +01:00
|
|
|
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
|
|
|
|
'';
|
2015-06-18 19:03:32 +02:00
|
|
|
|
2017-11-14 16:36:04 +01:00
|
|
|
__stdenvImpureHostDeps = commonImpureHostDeps;
|
|
|
|
__extraImpureHostDeps = commonImpureHostDeps;
|
2015-06-18 19:03:32 +02:00
|
|
|
|
|
|
|
initialPath = import ../common-path.nix { inherit pkgs; };
|
|
|
|
shell = "${pkgs.bash}/bin/bash";
|
|
|
|
|
2018-06-18 21:30:39 +02:00
|
|
|
cc = pkgs.llvmPackages.libcxxClang.override {
|
2018-07-27 21:52:50 +02:00
|
|
|
cc = pkgs.llvmPackages.clang-unwrapped;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
2017-08-15 17:30:45 +02:00
|
|
|
extraNativeBuildInputs = [];
|
2017-12-25 04:00:58 +01:00
|
|
|
extraBuildInputs = [ pkgs.darwin.CF ];
|
2015-06-18 19:03:32 +02:00
|
|
|
|
|
|
|
extraAttrs = {
|
|
|
|
inherit platform bootstrapTools;
|
|
|
|
libc = pkgs.darwin.Libsystem;
|
|
|
|
shellPackage = pkgs.bash;
|
2017-07-12 03:54:13 +02:00
|
|
|
|
|
|
|
# This is used all over the place so I figured I'd just leave it here for now
|
|
|
|
secure-format-patch = ./darwin-secure-format.patch;
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
allowedRequisites = (with pkgs; [
|
2017-05-24 01:36:50 +02:00
|
|
|
xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out
|
2018-06-14 16:22:33 +02:00
|
|
|
bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib llvmPackages.compiler-rt llvmPackages.compiler-rt.dev
|
|
|
|
zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
|
2016-02-01 18:16:50 +01:00
|
|
|
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
|
2018-01-02 00:52:22 +01:00
|
|
|
gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
|
2018-04-03 18:50:25 +02:00
|
|
|
binutils.bintools darwin.binutils darwin.binutils.bintools
|
2017-07-01 02:27:48 +02:00
|
|
|
cc.expand-response-params
|
2015-06-18 19:03:32 +02:00
|
|
|
]) ++ (with pkgs.darwin; [
|
2017-05-24 01:36:50 +02:00
|
|
|
dyld Libsystem CF cctools ICU libiconv locale
|
2015-06-18 19:03:32 +02:00
|
|
|
]);
|
|
|
|
|
2018-05-23 08:06:18 +02:00
|
|
|
overrides = lib.composeExtensions persistent (self: super: {
|
|
|
|
clang = cc;
|
|
|
|
llvmPackages = super.llvmPackages // { clang = cc; };
|
|
|
|
inherit cc;
|
2017-11-14 16:36:04 +01:00
|
|
|
|
2018-05-23 08:06:18 +02:00
|
|
|
darwin = super.darwin // {
|
|
|
|
xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; };
|
2017-03-18 21:48:27 +01:00
|
|
|
};
|
2018-05-23 08:06:18 +02:00
|
|
|
});
|
2015-06-18 19:03:32 +02:00
|
|
|
};
|
2016-01-04 03:47:09 +01:00
|
|
|
|
2016-12-16 14:22:02 +01:00
|
|
|
stagesDarwin = [
|
|
|
|
({}: stage0)
|
|
|
|
stage1
|
|
|
|
stage2
|
|
|
|
stage3
|
|
|
|
stage4
|
|
|
|
(prevStage: {
|
2016-12-24 19:55:11 +01:00
|
|
|
inherit config overlays;
|
2016-12-16 14:22:02 +01:00
|
|
|
stdenv = stdenvDarwin prevStage;
|
|
|
|
})
|
|
|
|
];
|
2015-06-18 19:03:32 +02:00
|
|
|
}
|