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

[20.09] git-mediate: enable Hydra build again #102491

Merged
merged 1 commit into from Nov 3, 2020

Conversation

KaiHa
Copy link
Contributor

@KaiHa KaiHa commented Nov 2, 2020

git-mediate was unbroke in e5aef98
but I forgot to enable the Hydra build again by removing the
hydraPlatforms line. Fixing my faux pas with this commit.

Additional I am removing the setting of broke to false, since false
seems to be anyhow the default.

Motivation for this change
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.

git-mediate was unbroke in e5aef98
but I forgot to enable the Hydra build again by removing the
hydraPlatforms line.  Fixing my faux pas with this commit.

Additional I am removing the setting of broke to false, since false
seems to be anyhow the default.
@roberth
Copy link
Member

roberth commented Nov 2, 2020

I suppose this should be equivalent to re-running hackage2nix. KaiHa has already changed the yaml file.

Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

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

@KaiHa Thanks for following up on this, this looks good.

@roberth We don't actually re-run the hackage update script on the release branches, but instead just manually edit the hackage-packages.nix file. (However, we do try to add things to the configuration-hackage2nix.nix file so that if the hackage-packages.nix file were to be regenerated, it would be regenerated correctly.)

@cdepillabout
Copy link
Member

It looks like ofborg isn't evaluating correctly, but I don't think that is related to this PR.

@cdepillabout cdepillabout merged commit d105075 into NixOS:release-20.09 Nov 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants