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

Use protoc from nix when available #1558

Merged
merged 8 commits into from
Jun 18, 2024

Conversation

ghostbuster91
Copy link
Contributor

PR Checklist (not all items are relevant to all PRs)

  • Added unit-tests (for runtime code)
  • Added bootstrapped code + smoke tests (when the rendering logic is modified)
  • Added build-plugins integration tests (when reflection loading is required at codegen-time)
  • Added alloy compliance tests (when simpleRestJson protocol behaviour is expanded/updated)
  • Updated dynamic module to match generated-code behaviour
  • Added documentation
  • Updated changelog

flake.nix Outdated Show resolved Hide resolved
"nodejs-16_x"
"yarn"
shellPackages = with pkgs; [
temurin-jre-bin-17
Copy link
Contributor Author

Choose a reason for hiding this comment

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

thought: I replaced default jre with the same one that is used on the CI

temurin-jre-bin-17
nodejs-18_x
yarn
(pkgs.sbt.override { jre = pkgs.temurin-jre-bin-17; })
Copy link
Contributor Author

Choose a reason for hiding this comment

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

thought: I had to override the jre version used by this particular derivation of sbt (which is still 1.8.x version) as it was using too recent version of jre - 21.

I then decided to completely drop the idea of shellInputs being just a list of strings since this required the packages to be defined in two places without any particular benefit. Also the errors from nix evaluator were harder to debug when using strings.

@ghostbuster91 ghostbuster91 requested a review from kubukoz June 11, 2024 13:41
flake.nix Outdated Show resolved Hide resolved
ghostbuster91 and others added 2 commits June 11, 2024 20:09
Co-authored-by: Jakub Kozłowski <kubukoz@gmail.com>
flake.nix Outdated Show resolved Hide resolved
@ghostbuster91 ghostbuster91 requested a review from kubukoz June 12, 2024 09:37
flake.nix Outdated Show resolved Hide resolved
@kubukoz kubukoz merged commit 8cef834 into disneystreaming:series/0.18 Jun 18, 2024
11 checks passed
@ghostbuster91 ghostbuster91 deleted the fix-proto-nix branch June 18, 2024 21:35
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.

2 participants