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

[backport] renpy: 7.1.3 -> 7.2.0 #59274

Merged
merged 1 commit into from
Apr 11, 2019
Merged

[backport] renpy: 7.1.3 -> 7.2.0 #59274

merged 1 commit into from
Apr 11, 2019

Conversation

erosennin
Copy link
Contributor

@erosennin erosennin commented Apr 10, 2019 •
edited
Loading

Motivation for this change

Ren'Py build is currently broken in release-19.03 due to the failing pygame_sdl2 dependency:

https://hydra.nixos.org/build/91927653
https://hydra.nixos.org/build/91927830

This has already been fixed in master by upgrading renpy and pygame_sdl2 to newer versions. Let's backport that.

cc #56826

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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@erosennin erosennin requested a review from FRidh as a code owner April 10, 2019 18:39
@7c6f434c
Copy link
Member

@GrahamcOfBorg build renpy pythonPackages.pygame_sdl2

worldofpeace
worldofpeace suggested changes Apr 11, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@erosennin The commit should be picked with

git cherry-pick -xe

https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches

@callahad @erosennin
renpy: 7.1.3 -> 7.2.0
d697522 
(cherry picked from commit 154a7d3)

Fixes build of renpy and pygame_sdl2.
@erosennin
Copy link
Contributor Author

@worldofpeace OK, done.

@7c6f434c
Copy link
Member

@GrahamcOfBorg build renpy pythonPackages.pygame_sdl2

@worldofpeace worldofpeace merged commit 6f6e99e into NixOS:release-19.03 Apr 11, 2019
@worldofpeace
Copy link
Contributor

Thanks @erosennin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@erosennin @7c6f434c @worldofpeace @GrahamcOfBorg @callahad