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

FreeOrion 0.4.7.1 -> 0.4.8 #45943

Merged
merged 1 commit into from Sep 2, 2018
Merged

FreeOrion 0.4.7.1 -> 0.4.8 #45943

merged 1 commit into from Sep 2, 2018

Conversation

tex
Copy link
Contributor

@tex tex commented Sep 2, 2018

Motivation for this change

Update to working version of FreeOrion.

Things done
  • 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.

@tex
Copy link
Contributor Author

tex commented Sep 2, 2018

Fixes #38615.

@jtojnar
Copy link
Contributor

jtojnar commented Sep 2, 2018

Why not update to stable 0.4.8?

@tex
Copy link
Contributor Author

tex commented Sep 2, 2018 •
edited

Well, newer is better. But truth is that it is because of this:

[1] milan@nixos> nix-prefetch-git --url https://github.com/freeorion/freeorion.git --rev "v0.4.8"                    /etc/nixos/nixpkgs
Bad commit hash or bad reference.

I have no idea how prefetch is supposed to be used now to fetch anything other than master...
It used to work as I would expect, but it does not anymore.

@jtojnar
Copy link
Contributor

jtojnar commented Sep 2, 2018

Since it only seems to contain 5 unimportant commits, you would need to change the version to unstable-2018-09-01 to comply with the policy, and it would also make work for automated updaters harder, I would suggest to stay with stable version, it is preferred anyway.

Regarding nix-prefetch-git, I prefer TOFU system, where I change the first byte of the hash (0→1 or 1→0) and nix-build will tell me the correct hash. Or use update-source-version which does everything for me.

@tex
Copy link
Contributor Author

tex commented Sep 2, 2018

Ok, will update to 0.4.8. BTW where can I get update-source-version?

@tex tex changed the title FreeOrion 0.4.7.1 -> 0.4.8-575bdae FreeOrion 0.4.7.1 -> 0.4.8 Sep 2, 2018
@jtojnar
Copy link
Contributor

jtojnar commented Sep 2, 2018

It is in common-updater-scripts.

Also could you squash the two commits?

@xeji
Copy link
Contributor

xeji commented Sep 2, 2018

@GrahamcOfBorg build freeorion

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: freeorion

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: freeorion

Partial log (click to expand)

shrinking /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/lib/freeorion/libfreeorionparse.so
shrinking /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/lib/freeorion/libfreeorioncommon.so
shrinking /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/bin/.freeorion-wrapped
shrinking /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/bin/freeorionca
shrinking /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/bin/freeoriond
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/lib  /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/bin
patching script interpreter paths in /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8
/nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8/fixpaths/fix-paths: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/ijnq3ypbdpk888k7j0c002ycqhmc5i97-freeorion-0.4.8...

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: freeorion

Partial log (click to expand)

[ 67%] Building CXX object CMakeFiles/freeoriond.dir/python/EnumWrapper.cpp.o
[ 68%] Building CXX object CMakeFiles/freeoriond.dir/python/LoggingWrapper.cpp.o
[ 69%] Building CXX object CMakeFiles/freeorionca.dir/python/AI/AIFramework.cpp.o
[ 69%] Building CXX object CMakeFiles/freeoriond.dir/python/UniverseWrapper.cpp.o
[ 69%] Building CXX object CMakeFiles/freeorionca.dir/python/AI/AIWrapper.cpp.o
[ 69%] Building CXX object CMakeFiles/freeorionca.dir/python/CommonFramework.cpp.o
[ 70%] Building CXX object CMakeFiles/freeorionca.dir/python/EmpireWrapper.cpp.o
[ 71%] Building CXX object CMakeFiles/freeoriond.dir/server/dmain.cpp.o
building of '/nix/store/mzqs55fs9rq21c96y2ryx73gj2kwfmhj-freeorion-0.4.8.drv' timed out after 1800 seconds
error: build of '/nix/store/mzqs55fs9rq21c96y2ryx73gj2kwfmhj-freeorion-0.4.8.drv' failed

@xeji xeji merged commit ae76e51 into NixOS:master Sep 2, 2018
@tex tex deleted the freeorion branch September 2, 2018 21:41
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
@tex @jtojnar @xeji @GrahamcOfBorg