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

commandergenius: 1822release -> 2.2.0 #37929

Merged
merged 1 commit into from Apr 1, 2018
Merged

commandergenius: 1822release -> 2.2.0 #37929

merged 1 commit into from Apr 1, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Mar 27, 2018 •
edited

Motivation for this change

The 1822-release build breaks on Hydra, some days ago the stable
2.2.0 release has been tagged on upstream.

It required some new build inputs (zlib, curl, SDL2_mixer, python3) and
some minor changes in the cmakeFlags and makeFlags for the build.

See https://hydra.nixos.org/build/71818713/log
See ticket #36453 and #31747

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

@Ma27
Copy link
Member Author

Ma27 commented Mar 27, 2018

this should be backported on release-18.03 as well

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: commandergenius

Partial log (click to expand)

-- Up-to-date: /nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0/build/source/build/$out/share/games/commandergenius/gameCatalogue.xml
-- Installing: /nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0/build/source/build/$out/share/games/commandergenius/README
-- Installing: /nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0/build/source/build/$out/share/games/commandergenius/changelog.txt
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0
shrinking /nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0/build/source/build/$out/bin/CGeniusExe
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0
checking for references to /build in /nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0...
/nix/store/jg7w0bdzfh79bz6i04xyny3yjjw9zlsn-commandergenius-2.2.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: commandergenius

Partial log (click to expand)

-- Installing: /nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source/build/$out/share/games/commandergenius/scripts/Oblivion/messageMap.py
-- Installing: /nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source/build/$out/share/games/commandergenius/README
-- Installing: /nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source/build/$out/share/games/commandergenius/changelog.txt
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0
shrinking /nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source/build/$out/bin/CGeniusExe
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0
checking for references to /build in /nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0...
/nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0

@fpletz
Copy link
Member

fpletz commented Mar 28, 2018

Looks wrong to me:

$ find `nix-build -A commandergenius`
/nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0
/nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build
/nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source
/nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source/build
/nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source/build/$out
/nix/store/m8iphz6zqy08yhqzkmmy2jqi2l65zhv8-commandergenius-2.2.0/build/source/build/$out/share
…

@Ma27
commandergenius: 1822release -> 2.2.0
d7894d0 
The `1822-release` build breaks on Hydra, some days ago the stable
`2.2.0` release has been tagged on upstream.

It required some new build inputs (zlib, curl, SDL2_mixer, python3) and
some minor changes in the cmakeFlags and makeFlags for the build.

See https://hydra.nixos.org/build/71818713/log
See ticket NixOS#36453 and NixOS#31747
@Ma27
Copy link
Member Author

Ma27 commented Mar 28, 2018

@fpletz oh crap sorry, I rebased the wrong change. Setting the flags in preConfigure provides a proper structure as $out will be evaluated properly :-D

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: commandergenius

Partial log (click to expand)

-- Installing: /nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0/share/games/commandergenius/README
-- Installing: /nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0/share/games/commandergenius/changelog.txt
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0
shrinking /nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0/bin/CGeniusExe
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0/bin
patching script interpreter paths in /nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0
checking for references to /build in /nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0...
/nix/store/baxhl30bp079ld1j7ifp6p76fjy42p7b-commandergenius-2.2.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: commandergenius

Partial log (click to expand)

-- Installing: /nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0/share/games/commandergenius/README
-- Installing: /nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0/share/games/commandergenius/changelog.txt
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0
shrinking /nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0/bin/CGeniusExe
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0/bin
patching script interpreter paths in /nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0
checking for references to /build in /nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0...
/nix/store/zlrl587absf6w8kph2s0jxa19wigd5ks-commandergenius-2.2.0

@Ma27
Copy link
Member Author

Ma27 commented Mar 31, 2018

ping @fpletz

@matthewbauer matthewbauer merged commit 55b88f4 into NixOS:master Apr 1, 2018
@Ma27 Ma27 deleted the fix-commandergenius branch April 5, 2018 13:51
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
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ma27 @GrahamcOfBorg @fpletz @matthewbauer