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

Update Boost to 1.65 and make it default #29814

Merged
merged 16 commits into from Oct 17, 2017
Merged

Conversation

abbradar
Copy link
Member

Motivation for this change

Update the default package. It brings fixes for NVCC so that we can use new CUDA toolkit 9.0 with default Boost (which we need due to GCC 6 default). Also NumPy support is improved.

I've made packages that overrode Boost to a newer one use the default version. RStudio update is needed to fix build.

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 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/)
  • Fits CONTRIBUTING.md.

I work on a system built with this Boost for some time, but don't have resources to test all packages.

ginVer = "1.5";
gwtVer = "2.7.0";
in
stdenv.mkDerivation rec {
name = "RStudio-${version}";

buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ];
buildInputs = [ cmake boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ];
Copy link
Member

Choose a reason for hiding this comment

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

You want to clean up the nativeBuildInputs while at it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good idea, done.

@abbradar
Copy link
Member Author

Ugh, Github requested reviews automatically because I accidentially pushed the wrong branch. Sorry.

@@ -1,4 +1,4 @@
{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }:
{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }:
Copy link
Member

Choose a reason for hiding this comment

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

This build needs both boost155 and boost162?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's a subpackage tree, some altcoins seem to need older Boosts.

Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

I like it. There's certainly going to be some fallout because of this change,so when the PR is merged there'll be another round of committing fixes to apps that break because of the new version. :-/

@abbradar
Copy link
Member Author

Let's merge this in several days if noone objects; I'll be watching Hydra for possible fallout.

Lassulus and others added 11 commits October 16, 2017 17:46
Encrypted devices: don't override crytpoModules, fix example
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Commit 271d3f7 ("prometheus service: globalConfig.labels is obsolete")
removed globalConfig.labels. Update the test config accordingly.
As far as I can tell, we've had this test since 2015, but it was never
enabled.
Refactor Steam so that native steam-run can be built as a free package and
expose it so that Hydra builds needed i686 packages.
This packages up the Starcraft II headless Linux client provided by
Blizzard for machine learning research.
I wrongly assumed that was the default when reviewing the PR.
@abbradar abbradar merged commit 35ad024 into NixOS:staging Oct 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants