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

gplates: use boost 160 #23489

Merged
merged 1 commit into from Mar 8, 2017
Merged

gplates: use boost 160 #23489

merged 1 commit into from Mar 8, 2017

Conversation

rardiol
Copy link
Contributor

@rardiol rardiol commented Mar 4, 2017

Motivation for this change

boost update 1.61 seems to have changed reference parameters for optional. I assume that's causing the break seen in hydra
https://hydra.nixos.org/build/49707856/nixlog/1
http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html

Still needs to be tested, compiling takes hours. Is there some config for Travis to do that?

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.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Mar 4, 2017

Still failing for me.

/tmp/nix-build-gplates-2.0.0.drv-0/gplates-2.0.0/src/property-values/ProxiedRasterResolver.cc:119:1:   required from here
include/boost/optional/detail/optional_reference_spec.hpp:83:8: error: 'const GPlatesGui::Mipmapper<GPlatesPropertyValues::RawRasterImpl<signed char, GPlatesPropertyValues::RawRasterDataPolicies::WithData, GPlatesPropertyValues::RawRasterStatisticsPolicies::WithStatistics, GPlatesPropertyValues::RawRasterNoDataValuePolicies::WithNoDataValue>, void>* boost::optional<const GPlatesGui::Mipmapper<GPlatesPropertyValues::RawRasterImpl<signed char, GPlatesPropertyValues::RawRasterDataPolicies::WithData, GPlatesPropertyValues::RawRasterStatisticsPolicies::WithStatistics, GPlatesPropertyValues::RawRasterNoDataValuePolicies::WithNoDataValue>, void>&>::ptr_' is private
include/boost/optional/detail/optional_reference_spec.hpp:97:82: error: within thiscontext
make[2]: *** [src/property-values/CMakeFiles/property-values.dir/build.make:1215: src/property-values/CMakeFiles/property-values.dir/ProxiedRasterResolver.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:1007: src/property-values/CMakeFiles/property-values.dir/all] Error 2
make: *** [Makefile:128: all] Error 2
builder for ‘/nix/store/cxfgmg9aw6bmdzv4dx7q06s1b6g6dns8-gplates-2.0.0.drv’ failed with exit code 2
error: build of ‘/nix/store/cxfgmg9aw6bmdzv4dx7q06s1b6g6dns8-gplates-2.0.0.drv’ failed

@rardiol
Copy link
Contributor Author

rardiol commented Mar 6, 2017

Thanks for that. I just looked more carefully at hydra and apparently it was broken from the moment it was merged into nixpkgs. So I need to bisect between where it was merged in and where I based my fork. This will take a while, as I need to compile qwt6 too.

@rardiol
Copy link
Contributor Author

rardiol commented Mar 6, 2017

Fixed compilation problem, problem was that cgal needed to be compiled with boost160. However I can't properly test the binary right now because #9415.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Mar 6, 2017

The program seems to run ok. I am downloading the sample files to be sure but it's taking a while.
Update: it works perfectly.

@dezgeg
Copy link
Contributor

dezgeg commented Mar 6, 2017

I get:

error: while evaluating ‘callPackageWith’ at /home/tmtynkky/.nox/nixpkgs/lib/customisation.nix:95:35, called from /home/tmtynkky/.nox/nixpkgs/pkgs/top-level/all-packages.nix:17469:13:
while evaluating ‘makeOverridable’ at /home/tmtynkky/.nox/nixpkgs/lib/customisation.nix:54:24, called from /home/tmtynkky/.nox/nixpkgs/lib/customisation.nix:99:8:
anonymous function at /home/tmtynkky/.nox/nixpkgs/pkgs/applications/science/misc/gplates/default.nix:1:1 called with unexpected argument ‘boost’, at /home/tmtynkky/.nox/nixpkgs/lib/customisation.nix:56:12

@rardiol
Copy link
Contributor Author

rardiol commented Mar 7, 2017

Why is the error showing up in ~/.nox ? I don't know enough about nix to be sure, but doesn't this error have something to do with your local nixpkgs customizations? Do you have something in ~/.nixpkgs ?

@fpletz
Copy link
Member

fpletz commented Mar 7, 2017

You also need to change the attribute name in pkgs/applications/science/misc/gplates/default.nix from boost159 to boost.

@rardiol
Copy link
Contributor Author

rardiol commented Mar 7, 2017

Didn't realize that was changed. Better remember to rebase on origin/master before the PR next time?

@dezgeg dezgeg merged commit e17d3d4 into NixOS:master Mar 8, 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

4 participants