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

solarus[-quest-editor]: 1.4.5 -> 1.5.3 #46081

Merged
merged 2 commits into from Sep 5, 2018
Merged

solarus[-quest-editor]: 1.4.5 -> 1.5.3 #46081

merged 2 commits into from Sep 5, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Sep 5, 2018 •
edited

Motivation for this change

#45960 has solarus-quest-editor failing.

This is (with at least another failure) fallout from Qt 5.10 -> 5.11 from June.

The update may not be strictly necessary to fix the issue, but:

  • It needed to be updated.
  • It allows using patches from upstream.

It'll need cherry-picking to release-18.09

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.

#44047 stops me from testing this :/.

@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: solarus, solarus-quest-editor

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 x86_64-linux (full log)

Attempted: solarus, solarus-quest-editor

Partial log (click to expand)

-- Installing: /nix/store/hxz3976waj9amjj7ydywkvx6rgmqykj6-solarus-quest-editor-1.5.3/share/applications/solarus-quest-editor.desktop
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/hxz3976waj9amjj7ydywkvx6rgmqykj6-solarus-quest-editor-1.5.3
shrinking /nix/store/hxz3976waj9amjj7ydywkvx6rgmqykj6-solarus-quest-editor-1.5.3/bin/solarus-quest-editor
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hxz3976waj9amjj7ydywkvx6rgmqykj6-solarus-quest-editor-1.5.3/bin
patching script interpreter paths in /nix/store/hxz3976waj9amjj7ydywkvx6rgmqykj6-solarus-quest-editor-1.5.3
checking for references to /build in /nix/store/hxz3976waj9amjj7ydywkvx6rgmqykj6-solarus-quest-editor-1.5.3...
postPatchMkspecs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: solarus, solarus-quest-editor

Partial log (click to expand)

-- Installing: /nix/store/aimy6s9qzn7hfmj0fxkq7fikphqz25kn-solarus-quest-editor-1.5.3/share/applications/solarus-quest-editor.desktop
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/aimy6s9qzn7hfmj0fxkq7fikphqz25kn-solarus-quest-editor-1.5.3
shrinking /nix/store/aimy6s9qzn7hfmj0fxkq7fikphqz25kn-solarus-quest-editor-1.5.3/bin/solarus-quest-editor
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/aimy6s9qzn7hfmj0fxkq7fikphqz25kn-solarus-quest-editor-1.5.3/bin
patching script interpreter paths in /nix/store/aimy6s9qzn7hfmj0fxkq7fikphqz25kn-solarus-quest-editor-1.5.3
checking for references to /build in /nix/store/aimy6s9qzn7hfmj0fxkq7fikphqz25kn-solarus-quest-editor-1.5.3...
postPatchMkspecs

@xeji xeji merged commit 91cc864 into NixOS:master Sep 5, 2018
@xeji
Copy link
Contributor

xeji commented Sep 5, 2018

backport: 508608d and dd1afaa

@samueldr samueldr deleted the fix/solarus branch September 5, 2018 13:36
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
3 participants
@samueldr @GrahamcOfBorg @xeji