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.

Sign up for GitHub

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

Jump to bottom

Fix flightgear, simgear & speed_dreams #49617

Merged
merged 4 commits into from
Nov 2, 2018
Merged

Fix flightgear, simgear & speed_dreams #49617

merged 4 commits into from
Nov 2, 2018
+56 −10

Conversation

aanderse
Copy link
Member

@aanderse aanderse commented Nov 1, 2018 •
edited
Loading

Motivation for this change

All 3 of these packages are broken in 18.09 due to incompatibility with the version of openscenegraph in 18.09. The idea is to reintroduce the version of openscenegraph shipped with 18.03 so these applications can work again.

Things done

As well as adding a second version of openscenegraph I have version bumped both flightgear & simgear, and fixed a separate bug in speed_dreams.
Since all of these packages are currently broken in 18.09 my intention is that these changes are backported to 18.09.

Once again looking to @7c6f434c for some review and/or approval on this.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 1, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: openscenegraph

Partial log (click to expand)

these paths will be fetched (7.65 MiB download, 46.81 MiB unpacked):
  /nix/store/pjnwnddrds6fryfxfq36cnm9w00c9acf-openscenegraph-3.6.2
copying path '/nix/store/pjnwnddrds6fryfxfq36cnm9w00c9acf-openscenegraph-3.6.2' from 'https://cache.nixos.org'...
/nix/store/pjnwnddrds6fryfxfq36cnm9w00c9acf-openscenegraph-3.6.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: openscenegraph

Partial log (click to expand)

  /nix/store/mfbspg0y079dl8dcrk5rsh3mh10wjwmp-mesa-noglu-18.2.2
  /nix/store/n84xfswbxip8ca0yqyssai1c106dzwc8-openscenegraph-3.6.2
copying path '/nix/store/mfbspg0y079dl8dcrk5rsh3mh10wjwmp-mesa-noglu-18.2.2' from 'https://cache.nixos.org'...
copying path '/nix/store/a87pywhz6p67b7dy3mb4i0vq1m0nwsd9-mesa-noglu-18.2.2-drivers' from 'https://cache.nixos.org'...
copying path '/nix/store/3jkazlcyhqss2kyy385ajhy6jcwzxdpk-mesa-noglu-18.2.2-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/d6dx6fylzg4z1yli7f57392q0bzklzz2-libGL-1.0.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/1ka1hdfk5bahykd2ccwlhxrnai3253rx-glu-9.0.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/61hw8d7zg4c95dpnilszsfsi146y4mds-libGLU-combined' from 'https://cache.nixos.org'...
copying path '/nix/store/n84xfswbxip8ca0yqyssai1c106dzwc8-openscenegraph-3.6.2' from 'https://cache.nixos.org'...
/nix/store/n84xfswbxip8ca0yqyssai1c106dzwc8-openscenegraph-3.6.2

@7c6f434c
Copy link
Member

7c6f434c commented Nov 2, 2018 •
edited
Loading

How exactly did GitHub manage not to put this for me into mention-notifications…

@7c6f434c 7c6f434c merged commit d24dee0 into NixOS:master Nov 2, 2018
@aanderse aanderse deleted the openscenegraph_3_4 branch November 2, 2018 10:10
@aanderse
Copy link
Member Author

aanderse commented Nov 2, 2018

Thank you kindly!

@baracoder baracoder mentioned this pull request Nov 2, 2018
Closed
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aanderse @GrahamcOfBorg @7c6f434c