Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stdenv: bootstrap cmake and python on darwin #21596

Merged
merged 1 commit into from Jan 3, 2017
Merged

Conversation

LnL7
Copy link
Member

@LnL7 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

@LnL7 LnL7 added 1.severity: mass-darwin-rebuild 6.topic: darwin Running or building packages on Darwin labels Jan 2, 2017
@mention-bot
Copy link

@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 ];
Copy link
Member

@FRidh FRidh Jan 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@@ -5176,9 +5176,13 @@ in
inherit (stdenvAdapters) overrideCC;
};

llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 {
llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 from staging to master January 3, 2017 17:03
@LnL7
Copy link
Member Author

LnL7 commented Jan 3, 2017

Merging straight to master because of 125fa15

@LnL7 LnL7 merged commit 0778a1c into NixOS:master Jan 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: mass-darwin-rebuild 6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants