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

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

Merged
merged 2 commits into from Oct 11, 2020
Merged

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 added 2 commits Oct 10, 2020
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 flokli requested review from globin, JohnAZoidberg and ocharles Oct 10, 2020
@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 flokli commented Oct 10, 2020

Result of nixpkgs-review pr 100156 1

1 package built:
- golden-cheetah
Copy link
Member

@JohnAZoidberg JohnAZoidberg left a comment

Seems to work fine. Thanks!

@flokli flokli merged commit d6295a5 into NixOS:master Oct 11, 2020
19 of 20 checks passed
19 of 20 checks passed
tests tests
Details
action
Details
golden-cheetah, golden-cheetah.passthru.tests on x86_64-darwin
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
golden-cheetah, golden-cheetah.passthru.tests on aarch64-linux Success
Details
golden-cheetah, golden-cheetah.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="43dc271"; rev="43dc2712564b5514e31de8d7bdf6f7827f7ca60b"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="43dc271"; rev="43dc2712564b5514e31de8d7bdf6f7827f7ca60b"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="43dc271"; rev="43dc2712564b5514e31de8d7bdf6f7827f7ca60b"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="43dc271"; rev="43dc2712564b5514e31de8d7bdf6f7827f7ca60b"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="43dc271"; rev="43dc2712564b5514e31de8d7bdf6f7827f7ca60b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="43dc271"; rev="43dc2712564b5514e31de8d7bdf6f7827f7ca60b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="43dc271"; rev="43dc2712564b5514e31de8d7bdf6f7827f7ca60b"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@flokli flokli deleted the flokli:golden-cheetah-3.5 branch Oct 11, 2020
@flokli
Copy link
Contributor Author

@flokli 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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.