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

darwin-stdenv: remove python dependencies #26310

Merged
merged 2 commits into from Jun 5, 2017

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Jun 1, 2017

Motivation for this change

Disable the llvm/clang manpages on darwin to avoid python packages in the stdenv. 😞

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 using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

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

@LnL7
Copy link
Member Author

LnL7 commented Jun 1, 2017

/cc @vcunat It's not ideal, but this reduces the stdenv packages back to what most people will expect.

@FRidh
Copy link
Member

FRidh commented Jun 2, 2017

@LnL7 would it be possible to save the build directory to an output and then build the docs from that? That way, you could have the docs without a full rebuild and without making it a requirement of the stdenv.

@LnL7
Copy link
Member Author

LnL7 commented Jun 2, 2017

I was thinking of fixing it in the bootstrap stages, but that could also work. Either way I'd like to get this in master first to avoid unexpected rebuilds.

@FRidh FRidh added the 6.topic: darwin Running or building packages on Darwin label Jun 3, 2017
@@ -45,7 +49,8 @@ let
sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
'';

outputs = [ "out" "man" "python" ];
outputs = [ "out" "python" ]
++ stdenv.lib.optional enableManpages "man";
Copy link
Member

Choose a reason for hiding this comment

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

I think this is going to cause a linux mass-rebuild as well, because the order of the outputs has changed.

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, the second commit introduces rebuilds. this is not the only thing

outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
outputs = [ "out" ]
++ stdenv.lib.optional enableSharedLibraries "lib"
++ stdenv.lib.optional enableManpages "man";
Copy link
Member

Choose a reason for hiding this comment

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

order has changed

@FRidh
Copy link
Member

FRidh commented Jun 5, 2017

@vcunat @LnL7 merge?

@LnL7
Copy link
Member Author

LnL7 commented Jun 5, 2017

I just wanted to wait for hydra to get through the large trunk/staging queue first.

@LnL7 LnL7 merged commit 30f329e into NixOS:staging Jun 5, 2017
@LnL7 LnL7 deleted the darwin-stdenv-no-sphinx branch June 5, 2017 10:45
@vcunat
Copy link
Member

vcunat commented Jun 5, 2017

I only skimmed it very briefly. My knowledge of Darwin (and interest) is rather low.

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