stdenv: bootstrap cmake and python on darwin #21596

Merged
merged 1 commit into from Jan 3, 2017

Projects

None yet

3 participants

@LnL7
Contributor
LnL7 commented Jan 2, 2017
Motivation for this change

Use bootstrap versions of cmake and python to get some dependencies like curl, libarchive and sqlite out of the stdenv.

/cc @copumpkin

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change: lnl7-wip
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

-CF-osx-10.9.5-private.drv
-DevSDK_OSX109.pkg.drv
-MacOS_SDK-10.9.drv
-OSXPrivateSDK-f4d52b60e86b496abfaffa119a7d299562d99783-src.drv
-apple-framework-Accelerate.drv
-apple-framework-ApplicationServices.drv
-apple-framework-CFNetwork.drv
-apple-framework-CoreAudio.drv
-apple-framework-CoreData.drv
-apple-framework-CoreGraphics.drv
-apple-framework-CoreServices.drv
-apple-framework-CoreText.drv
-apple-framework-CoreWLAN.drv
-apple-framework-DiskArbitration.drv
-apple-framework-IOBluetooth.drv
-apple-framework-IOKit.drv
-apple-framework-IOSurface.drv
-apple-framework-ImageIO.drv
-apple-framework-NetFS.drv
-apple-framework-OpenDirectory.drv
-apple-framework-Security.drv
-apple-framework-SecurityFoundation.drv
-apple-framework-ServiceManagement.drv
-apple-framework-SystemConfiguration.drv
-apple-lib-xpc.drv
-cmake-3.7.1.drv
+cmake-boot-3.7.1.drv
-curl-7.51.0.drv
-db-5.3.28.drv
-expat-2.2.0.drv
-gdbm-1.12.drv
-gdbm-1.12.drv
-libarchive-3.2.2.drv
-libssh2-1.8.0.drv
-libuv-1.10.1.drv
-libuv-v1.10.1-src.drv
-lzo-2.09.drv
-openssl-1.0.2j.drv
-openssl-1.0.2j.drv
-python-2.7.13.drv
+python-boot-2.7.12.drv
-readline-6.3p08.drv
-sharutils-4.11.1.drv
-sqlite-3.15.2.drv
-xar-1.5.2.drv
@mention-bot

@LnL7, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dtzWill, @vcunat and @gridaphobe to be potential reviewers.

+ '';
+ license = stdenv.lib.licenses.psfl;
+ platforms = stdenv.lib.platforms.all;
+ maintainers = with stdenv.lib.maintainers; [ lnl7 chaoflow domenkozar ];
@FRidh
FRidh Jan 2, 2017 edited Member

I suppose you or darwin maintainers are going to maintain this expression?

@LnL7
LnL7 Jan 2, 2017 Contributor

Yes, I separated this so changes in the default python expression won't necessarily cause a rebuild of the entire darwin world.

@FRidh
FRidh approved these changes Jan 2, 2017 View changes
@@ -5176,9 +5176,13 @@ in
inherit (stdenvAdapters) overrideCC;
};
- llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 {
+ llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
@LnL7
LnL7 Jan 2, 2017 Contributor

I'm pretty sure I should do this somewhere else but I couldn't get it working in the stdenv bootstrap phases.

@LnL7 LnL7 changed the base branch to NixOS:master from NixOS:staging Jan 3, 2017
@LnL7
Contributor
LnL7 commented Jan 3, 2017

Merging straight to master because of 125fa15

@LnL7 LnL7 merged commit 0778a1c into NixOS:master Jan 3, 2017

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment