grafana: 11.6.0+security-01 -> 12.0.0#404897
Merged
K900 merged 1 commit intoNixOS:masterfrom May 8, 2025
Merged
Conversation
github-actions
bot
added
6.topic: nixos
Ma27
commented
May 7, 2025
Member
Author
There was a problem hiding this comment.
This is needed because otherwise goModules also tries to run the yarn hook (see comment).
Can we maybe extract the goModules part into a fetchGoDeps, similar to fetchYarnBerryDeps etc.?
Contributor
There was a problem hiding this comment.
You can also set dontYarnBerryInstallDeps=1 if you think it's more elegant
3 tasks
github-actions
bot
added
10.rebuild-darwin: 1
nix-owners
bot
requested review from
Frostman,
WilliButz,
fpletz,
globin and
offlinehacker
emilylange
reviewed
May 7, 2025
Closes NixOS#404580 ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.0.0 A few changes were necessary here: * the provision seems to be delayed now, so the `machine.succeed` broke because the result was tested before the provisioning was finished. Using `wait_until_succeeds` to solve this. * Work around a problem that got unnoticed during NixOS#399404: the setup-hook is also run in the `goModules` derivation, but `offlineCache` is missing. As a result, the build breaks. I guess this was unnoticed because everyone had a goModules with the previous hash in their store. Co-authored-by: Emily <git@emilylange.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #404580
ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.0.0
A few changes were necessary here:
the provision seems to be delayed now, so the
machine.succeedbroke because the result was tested before the provisioning was finished. Usingwait_until_succeedsto solve this.Hacky way to work around a problem that got unnoticed during fetchYarnBerryDeps: init #399404: the setup-hook is also run in the
goModulesderivation, butofflineCacheis missing. As a result, the build breaks. I guess this was unnoticed because everyone had a goModules with the previous hash in their store. For now, working around with someoverrideAttrsmagic, but we'll need a nicer solution.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.