Skip to content

Comments

Update macOS to 10.12#56744

Merged
matthewbauer merged 70 commits intoNixOS:stagingfrom
matthewbauer:macos-10-12
Apr 27, 2019
Merged

Update macOS to 10.12#56744
matthewbauer merged 70 commits intoNixOS:stagingfrom
matthewbauer:macos-10-12

Conversation

@matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Mar 3, 2019 •
edited
Loading

Motivation for this change

This is big enough that it probably needs its own jobset. This bumps the SDKs to 10.12, as well as adds symbols only available in 10.12. As a result, this means that Nixpkgs will only work on systems with macOS 10.12+.

Other things done:

  • In addition, I've brought back the cross patch shebangs work. It needed some tweaking to get things working but the final result doesn't leak bootstrap-tools.
  • Removed some old patches that should not be needed with newer SDKs.
  • Update LLVM to 7 everywhere (/cc @dtzWill). Based off of LLVM 8 (currently on -rc3) #56490.
  • Add libtapi support for cctools. This is just a flag to cctools-port that it can use.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: darwin Running or building packages on Darwin 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: stdenv Standard environment 2.status: merge conflict This PR has merge conflicts with the target branch labels Mar 3, 2019
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Mar 3, 2019
@matthewbauer
Copy link
Member Author

matthewbauer commented Mar 3, 2019

Oh, does cf-private add -framework CoreFoundation? If so we can probably get rid of it in a bunch of other places.

It adds /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation to get the objc runtime. It should only be needed if you get errors like:

_OBJC_CLASS_$_NSArray is undefined

@veprbl veprbl mentioned this pull request Mar 3, 2019
Merged
3 tasks
@matthewbauer
Copy link
Member Author

matthewbauer commented Mar 4, 2019

If you are just missing _NS* symbols you just need -framework CoreFoundation

@matthewbauer
rustc: use llvm5 for bootstrapping
f0b7561
@matthewbauer
darwin-bootstrap: copy libLLVM dylib
f1461d8 
This is needed for the bootstrap tools to work:

https://hydra.nixos.org/build/92534667
@matthewbauer
mosh: use llvm6 stdenv on clang stdenv
db032fe
@matthewbauer
file-rename: don’t run tests on darwin
9eb4623 
https://hydra.nixos.org/build/92527786
@matthewbauer
xml2rfc: don’t run tests on darwin
698ff78 
https://hydra.nixos.org/build/92523991
@matthewbauer
python-fenics: put pytest in nativeBuildInputs
63831c3
@matthewbauer
treewide: mark bad packages
da38a49 
Some old stuff is known not to work.
@matthewbauer
spectral: add qtmacextras
18e7c5a
@matthewbauer
tokei: add libiconv for macos
29cdd08
@matthewbauer
qt5: use llvm5 for all modules
c1f1a0e 
This avoids some issues encountered with qt5 not working libcxx 7. We
can remove this at some point when qt5 has addressed all of their issues.
@matthewbauer matthewbauer merged commit 87944c3 into NixOS:staging Apr 27, 2019
@ThomasMader
Copy link
Contributor

ThomasMader commented Apr 27, 2019

I recognized that you disabled the entire checkPhase for ldc on Darwin.
The error coming from there seems to me to be very serious. I think ldc might have trouble working correctly making it unusable on Darwin.

For dmd the commented make line in the checkPhase should work now again with your changes about the filesystem stuff in the linker and should fix #57120 .

@matthewbauer
Copy link
Member Author

matthewbauer commented Apr 28, 2019

I recognized that you disabled the entire checkPhase for ldc on Darwin.
The error coming from there seems to me to be very serious. I think ldc might have trouble working correctly making it unusable on Darwin.

For dmd the commented make line in the checkPhase should work now again with your changes about the filesystem stuff in the linker and should fix #57120 .

I was able to compile and run some simple D code, but I can work on getting the tests passing as well

This was referenced Apr 30, 2019
Merged
Closed
@nixos-discourse
Copy link

nixos-discourse commented May 7, 2019

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/darwin-macos-10-12-stdenv-updates/2862/1

@LnL7
Copy link
Member

LnL7 commented May 7, 2019

@matthewbauer After reading your post I realised that we didn't update MACOSX_DEPLOYMENT_TARGET, not a big deal but perhaps we should?

@matthewbauer
Copy link
Member Author

matthewbauer commented May 7, 2019

@matthewbauer After reading your post I realised that we didn't update MACOSX_DEPLOYMENT_TARGET, not a big deal but perhaps we should?

Yeah that would be a good idea! Also removing the gl_cv_func_getcwd_abort_bug thing should be possible

@ThomasMader ThomasMader mentioned this pull request May 10, 2019
Merged
10 tasks
@worldofpeace worldofpeace mentioned this pull request May 11, 2019
Closed
@ThomasMader ThomasMader mentioned this pull request May 12, 2019
Merged
10 tasks
@rvolosatovs rvolosatovs mentioned this pull request May 26, 2019
Merged
10 tasks
@dudebout dudebout mentioned this pull request Jun 1, 2019
Closed
@LnL7 LnL7 mentioned this pull request Jul 8, 2019
Merged
10 tasks
@ggreif ggreif mentioned this pull request Jan 25, 2020
Merged
12 tasks
@LnL7 LnL7 mentioned this pull request Nov 26, 2020
Closed
10 tasks
@SuperSandro2000 SuperSandro2000 mentioned this pull request Dec 24, 2020
Closed
@kira-bruneau kira-bruneau mentioned this pull request Feb 14, 2021
Merged
10 tasks
@kidonng kidonng mentioned this pull request Mar 21, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@copumpkin copumpkin Awaiting requested review from copumpkin

@veprbl veprbl Awaiting requested review from veprbl

@LnL7 LnL7 Awaiting requested review from LnL7

@dtzWill dtzWill Awaiting requested review from dtzWill

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@basvandijk basvandijk Awaiting requested review from basvandijk

@FRidh FRidh Awaiting requested review from FRidh

@peti peti Awaiting requested review from peti

@ryantm ryantm Awaiting requested review from ryantm

@ttuegel ttuegel Awaiting requested review from ttuegel

@Mic92 Mic92 Awaiting requested review from Mic92

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: emacs Text editor 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

19.09

Development

Successfully merging this pull request may close these issues.

10 participants

@matthewbauer @LnL7 @tobim @veprbl @nixos-discourse @softinio @ttuegel @ThomasMader @dtzWill @GrahamcOfBorg