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.

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

golden-cheetah: fix build, 3.5-RC2X -> 3.5 #100156

Merged
merged 2 commits into from Oct 11, 2020
Merged

golden-cheetah: fix build, 3.5-RC2X -> 3.5 #100156

merged 2 commits into from Oct 11, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Oct 10, 2020

Motivation for this change

golden-cheetah broke during aec3c76 (bison bump).

This applies a fix proposed upstream at GoldenCheetah/GoldenCheetah#3590. Upstream issue: GoldenCheetah/GoldenCheetah#3586

This also bumps to the proper release, not the RC we're currently at.

Once merged, should be backported to 20.09 as well.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli
golden-cheetah: fix build with bison 3.7
a73c125 
Currently, GoldenCheetah fails to build with Bison >=3.7 (which we use
for some time).

This applies the commit from GoldenCheetah/GoldenCheetah#3590.

Upstream issue: GoldenCheetah/GoldenCheetah#3586
@flokli
golden-cheetah: 3.5-RC2X -> 3.5
43dc271
@flokli flokli changed the title golden-cheetah: fix build, 3.5-RC2X 3.5 golden-cheetah: fix build, 3.5-RC2X -> 3.5 Oct 10, 2020
@flokli
Copy link
Contributor Author

flokli commented Oct 10, 2020

Result of nixpkgs-review pr 100156 1

1 package built:
- golden-cheetah

JohnAZoidberg
JohnAZoidberg approved these changes Oct 11, 2020
View reviewed changes
Copy link
Member

@JohnAZoidberg JohnAZoidberg left a comment

Choose a reason for hiding this comment

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

Seems to work fine. Thanks!

@flokli flokli merged commit d6295a5 into NixOS:master Oct 11, 2020
@flokli flokli deleted the golden-cheetah-3.5 branch October 11, 2020 17:36
@flokli
Copy link
Contributor Author

flokli commented Oct 11, 2020

Backported to 20.09 in 87f329d and 1467c16.

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

@ocharles ocharles ocharles approved these changes

@JohnAZoidberg JohnAZoidberg JohnAZoidberg approved these changes

@globin globin Awaiting requested review from globin

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @ocharles @JohnAZoidberg