[backport: 20.09] darwin (Big Sur): tbd based stdenv #105799

davidtwco · 2020-12-03T15:30:44Z

Motivation for this change

This PR backports #98541 to 20.09. This is helpful for projects using NixOps that have a pinned nixpkgs commit to a stable NixOS release, in that circumstance, developers using Big Sur can't enter the nix-shell without these changes.

Things done

SuperSandro2000 · 2020-12-03T16:57:18Z

While I was working on pyobjc I needed the two commits below to to build some things. I am not sure we should backport such major change to a stable version. Big Sur has probably more bugs and telling them to use the unstable channel until 21.XX is out is probably less hassle.

79f3fa3
0cc95f6

davidtwco · 2020-12-03T17:15:42Z

I am not sure we should backport such major change to a stable version. Big Sur has probably more bugs and telling them to use the unstable channel until 21.XX is out is probably less hassle.

I think there's enough value in having a stable branch which can be pinned by projects and have those projects still be usable on Big Sur to justify this backport.

matthewbauer · 2020-12-03T17:37:18Z

We usually don't backport big stdenv changes like this. However, since Big Sur is pretty much broken without it, I think it's probably a good idea in this case.

LnL7 · 2020-12-03T17:38:54Z

I would definitively like to backport the fixes, we can test for regressions with a wip jobset to make sure nothing important was missed. However I think it would be best to wait until bootstrapping and some of the missing stubs are sorted out.

chessai · 2020-12-17T20:21:47Z

Agreed, Big Sur breakage is too big a deal to not backport IMO

jonringer · 2021-01-04T15:15:36Z

If someone is able to verify that there's no regressions, I'm fine with merging this. But it should target staging-20.09

This new version has tapi support, which is needed to build the new stubs based libSystem, etc. and Big Sur support. You can verify the provenance of these yourself by checking Hydra here: https://hydra.nixos.org/build/128192471

Adapted from main expression for clang 7.

Build the llvm support libraries (libcxx, libcxxabi) from scratch without using the existing llvm libraries. This is the same spirit and similar implementation as the "useLLVM" bootstrap in llvm package sets. Critically it avoids having libcxxabi provided by the cc-wrapper when building libcxx, which otherwise results in two libcxxabi instances. $ otool -L /nix/store/vd4vvgs9xngqbjzpg3qc41wl6jh42s9i-libc++-7.1.0/lib/libc++.dylib /nix/store/vd4vvgs9xngqbjzpg3qc41wl6jh42s9i-libc++-7.1.0/lib/libc++.dylib: /nix/store/vd4vvgs9xngqbjzpg3qc41wl6jh42s9i-libc++-7.1.0/lib/libc++.1.0.dylib (compatibility version 1.0.0, current version 1.0.0) /nix/store/gmpwk5fyp3iasppqrrdpswxvid6kcp8r-libc++abi-7.1.0/lib/libc++abi.dylib (compatibility version 1.0.0, current version 1.0.0) /nix/store/3hn7azynqgp2pm5gpdg45gpq0ia72skg-libc++abi-7.1.0/lib/libc++abi.dylib (compatibility version 1.0.0, current version 1.0.0) /nix/store/1nq94scbxs6bk7pimqhvz76q6cfmbv97-Libsystem-osx-10.12.6/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1226.10.1) Additionally move some utilities (clang, binutils, coreutils, gnugrep) to the stage layers so they can be replaced before the final stdenv. This should cause most of stage4 to be built from the toolchain assembled as of stage3 instead of the bootstrap toolchain.

Exposed by the tbd stubs which contains fat libraries. The previously used proxy libraries were x86_64 only.

Used during bootstrap to check that re-exported libraries are not dangling.

Fixes bootstrapping on macOS Big Sur.

davidtwco · 2021-01-07T17:00:42Z

I've rebased this onto staging-20.09 as requested, and included #107013.

phile314 · 2021-01-18T08:39:15Z

Is there anything that can be done to help getting this merged? If there is anything to test, how do I best test it?

jonringer · 2021-01-18T08:57:48Z

Is there anything that can be done to help getting this merged? If there is anything to test, how do I best test it?

building the major packages would be a good start, but as I don't have access to darwin hardware (and doing anything else is technically illegal), it's up to @NixOS/darwin-maintainers to merge this.

jonringer · 2021-01-18T08:58:55Z

@SuperSandro2000 if you could build some of the more major packages, I'm assuming this is good as unstable seems to be fine. However, we could be missing a PR which is correcting unstable behavior.

SuperSandro2000 · 2021-01-19T13:18:01Z

pkgs/development/compilers/llvm/10/compiler-rt.nix

@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
    "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
  ] ++ stdenv.lib.optionals (bareMetal) [
    "-DCOMPILER_RT_OS_DIR=baremetal"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [


Suggested change

] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [

] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [

stdenv.lib is deprecated.

SuperSandro2000 · 2021-01-19T13:18:08Z

pkgs/development/compilers/llvm/7/libc++abi.nix

+     stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
+     stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";


Suggested change

stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++

stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";

lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++

lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";

SuperSandro2000 · 2021-01-19T13:18:49Z

pkgs/os-specific/darwin/apple-sdk/print-reexports/default.nix

+
+stdenv.mkDerivation {
+  name = "print-reexports";
+  src = stdenv.lib.sourceFilesBySuffices ./. [".c"];


Suggested change

src = stdenv.lib.sourceFilesBySuffices ./. [".c"];

src = lib.sourceFilesBySuffices ./. [".c"];

SuperSandro2000 · 2021-01-19T13:22:07Z

@SuperSandro2000 if you could build some of the more major packages, I'm assuming this is good as unstable seems to be fine. However, we could be missing a PR which is correcting unstable behavior.

I am against backporting any of these major stdenv changes to 20.09. If you are using Big Sur you either need to wait for 21.05 or use unstable until then. Any of those changes could break a lot and the Darwin maintainers are rare currently so I don't want to deal with any of the potential bugs.

I can try to build a few packages but rebuilding stdenv never worked for me so I expect it to fail. Also I am not on Big Sur and I do not plan to update to it anytime soon.

domenkozar · 2021-01-19T17:08:45Z

Note that a lot of macOS users do update their OS and this completely breaks their system currently on 20.09, so having fewer packages to work is better than zero.

jonringer · 2021-01-19T17:24:13Z

if any bigsur user wants to help this along, you can run a nixpkgs review of all the channel blockers and a package from most of the toolchains

nixpkgs-review pr 105799 \
  --package ripgrep \
  --package python3Packages.requests \
  --package direnv \
  --package vim \
  --package pandoc \
  --package postgresql \
  --package mariadb \
  --package cabal2nix \
  --package openssh \
  --package git \
  --package ruby \
  --package cachix \
  --package gimp \
  --package emacs \
  --package nix \
  --package python \
  --package wireshark \
  --package transmission-gtk

SuperSandro2000 · 2021-01-19T17:57:40Z

if any bigsur user wants to help this along, you can run a nixpkgs review of all the channel blockers and a package from most of the toolchains

The problem with this is that nixpkgs-review activates the sandbox which prevents rebuilds of stdenv on darwin.

jonringer · 2021-01-19T18:13:18Z

The problem with this is that nixpkgs-review activates the sandbox which prevents rebuilds of stdenv on darwin.

Oh.... that's awkward. And I was not aware of this.

Guess I'm just having it easy in purity land.

MarcoPolo · 2021-01-19T18:24:36Z

Is there a way to disable the sandbox?

I have a Big Sur machine handy. Anything I can do to help?

SuperSandro2000 · 2021-01-19T19:07:11Z

Is there a way to disable the sandbox?

For nixpkgs-review. Not currently but I am talking to @Mic92 to solve this.

I have a Big Sur machine handy. Anything I can do to help?

You can try building this PR and see if it even works.

SuperSandro2000 · 2021-01-19T22:45:43Z

Tried building python3 without sandbox:

checking build system type... x86_64-apple-darwin19.6.0
checking host system type... x86_64-apple-darwin19.6.0
checking for a BSD-compatible install... /nix/store/ai232lgqxzkhwl0zd3pvprj3hdgab6v6-coreutils-8.31/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /nix/store/ai232lgqxzkhwl0zd3pvprj3hdgab6v6-coreutils-8.31/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking whether make supports the include directive... yes (GNU style)
checking for gcc... clang
checking whether the C compiler works... no
configure: error: in `/private/var/folders/r4/k85s52jx3555ckj0wty615s00000gp/T/nix-build-expat-2.2.8.drv-0/expat-2.2.8':
configure: error: C compiler cannot create executables
See `config.log' for more details
builder for '/nix/store/w4yqg2rch50rqpwqh1pz94863hbzi0iv-expat-2.2.8.drv' failed with exit code 77
cannot build derivation '/nix/store/bd1523xydp5mndb0d5qk8qw6vnsf8mbc-python3-3.8.5.drv': 1 dependencies couldn't be built
error: build of '/nix/store/bd1523xydp5mndb0d5qk8qw6vnsf8mbc-python3-3.8.5.drv' failed

MarcoPolo · 2021-01-20T17:25:53Z

Yep, failed at the same spot as Sandro on Big Sur.

davidtwco requested review from matthewbauer and ttuegel as code owners December 3, 2020 15:30

ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 3, 2020

davidtwco mentioned this pull request Dec 3, 2020

darwin (Big Sur): tbd based stdenv #98541

Merged

14 tasks

ofborg bot added 6.topic: qt/kde 6.topic: stdenv Standard environment 10.rebuild-darwin-stdenv 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 1-10 labels Dec 3, 2020

LnL7 added this to Big Sur in Darwin Dec 17, 2020

jbgi mentioned this pull request Jan 4, 2021

Update nixpkgs to the latest revision of nixos-unstable branch input-output-hk/iohk-nix#457

Merged

MarcoPolo mentioned this pull request Jan 4, 2021

Fails on macOS Big Sur (?) input-output-hk/haskell.nix#982

Closed

LnL7 and others added 10 commits January 7, 2021 16:52

stdenv/darwin: bump bootstrap tools

f8a4f46

This new version has tapi support, which is needed to build the new stubs based libSystem, etc. and Big Sur support. You can verify the provenance of these yourself by checking Hydra here: https://hydra.nixos.org/build/128192471

darwin/stdenv: assemble full clang toolchain

96de0d3

Adapted from main expression for clang 7.

compiler-rt: prevent platform sniffing on Darwin

fc3e6e6

Exposed by the tbd stubs which contains fat libraries. The previously used proxy libraries were x86_64 only.

darwin/darwin-stubs: init

e217a33

darwin/print-reexports: nixpkgs-specific utility to inspect .tbd files

0c49384

Used during bootstrap to check that re-exported libraries are not dangling.

darwin/Libsystem: use darwin-stubs

54f6326

darwin/Security: use darwin-stubs

2473d73

darwin/IOKit: use darwin-stubs

05dc647

darwin/objc4: use darwin-stubs

bfe8fd9

thefloweringash added 3 commits January 7, 2021 16:52

darwin/apple-sdk: explain why Kernel.framework has no .tbd file

3bc7109

darwin/print-reexports: add an overview comment

e6acacd

darwin/stdenv: tapi stub based bootstrap

caf7f4b

Fixes bootstrapping on macOS Big Sur.

davidtwco force-pushed the backport-20.09-big-sur-tbd branch from 8d04cd6 to caf7f4b Compare January 7, 2021 16:59

davidtwco requested a review from thoughtpolice as a code owner January 7, 2021 16:59

davidtwco changed the base branch from release-20.09 to staging-20.09 January 7, 2021 17:00

ofborg bot added 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 1-10 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000 labels Jan 7, 2021

lrworth mentioned this pull request Jan 9, 2021

Enable building with latest nixpkgs nmattia/niv#298

Closed

michaelpj mentioned this pull request Jan 11, 2021

Add ghc 8.10.3 input-output-hk/haskell.nix#980

Merged

SuperSandro2000 requested changes Jan 19, 2021

View reviewed changes

davidtwco closed this Jan 20, 2021

davidtwco deleted the backport-20.09-big-sur-tbd branch June 18, 2022 08:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[backport: 20.09] darwin (Big Sur): tbd based stdenv #105799

[backport: 20.09] darwin (Big Sur): tbd based stdenv #105799

davidtwco commented Dec 3, 2020

SuperSandro2000 commented Dec 3, 2020

davidtwco commented Dec 3, 2020

matthewbauer commented Dec 3, 2020

LnL7 commented Dec 3, 2020

chessai commented Dec 17, 2020

jonringer commented Jan 4, 2021

davidtwco commented Jan 7, 2021

phile314 commented Jan 18, 2021

jonringer commented Jan 18, 2021

jonringer commented Jan 18, 2021

SuperSandro2000 Jan 19, 2021

SuperSandro2000 Jan 19, 2021

SuperSandro2000 Jan 19, 2021

SuperSandro2000 commented Jan 19, 2021 •

edited

domenkozar commented Jan 19, 2021

jonringer commented Jan 19, 2021 •

edited

SuperSandro2000 commented Jan 19, 2021

jonringer commented Jan 19, 2021

MarcoPolo commented Jan 19, 2021

SuperSandro2000 commented Jan 19, 2021

SuperSandro2000 commented Jan 19, 2021 •

edited

MarcoPolo commented Jan 20, 2021

	] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [
	] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [

		stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++
		stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";

	src = stdenv.lib.sourceFilesBySuffices ./. [".c"];
	src = lib.sourceFilesBySuffices ./. [".c"];

[backport: 20.09] darwin (Big Sur): tbd based stdenv #105799

[backport: 20.09] darwin (Big Sur): tbd based stdenv #105799

Conversation

davidtwco commented Dec 3, 2020

Motivation for this change

Things done

SuperSandro2000 commented Dec 3, 2020

davidtwco commented Dec 3, 2020

matthewbauer commented Dec 3, 2020

LnL7 commented Dec 3, 2020

chessai commented Dec 17, 2020

jonringer commented Jan 4, 2021

davidtwco commented Jan 7, 2021

phile314 commented Jan 18, 2021

jonringer commented Jan 18, 2021

jonringer commented Jan 18, 2021

SuperSandro2000 Jan 19, 2021

Choose a reason for hiding this comment

SuperSandro2000 Jan 19, 2021

Choose a reason for hiding this comment

SuperSandro2000 Jan 19, 2021

Choose a reason for hiding this comment

SuperSandro2000 commented Jan 19, 2021 • edited

domenkozar commented Jan 19, 2021

jonringer commented Jan 19, 2021 • edited

SuperSandro2000 commented Jan 19, 2021

jonringer commented Jan 19, 2021

MarcoPolo commented Jan 19, 2021

SuperSandro2000 commented Jan 19, 2021

SuperSandro2000 commented Jan 19, 2021 • edited

MarcoPolo commented Jan 20, 2021

SuperSandro2000 commented Jan 19, 2021 •

edited

jonringer commented Jan 19, 2021 •

edited

SuperSandro2000 commented Jan 19, 2021 •

edited