Feature/prometheus dont jailbreak#82907
Merged
cdepillabout merged 1 commit intoNixOS:haskell-updatesfrom Mar 19, 2020
Merged
Conversation
ofborg
bot
added
6.topic: haskell
Member
|
@GrahamcOfBorg build haskellPackages.prometheus |
ofborg
bot
added
10.rebuild-darwin: 1-10
Member
|
@sevanspowell Can you fix the conflict? After that, this looks good to merge in. |
- prometheus no longer needs to be jailbroken, removing 'doJailbreak'. Jailbreaking was added in NixOS#70956 to overcome issue bitnomial/prometheus#34. - This issue has since been fixed and so jailbreaking is no longer necessary.
sevanspowell
force-pushed
the
feature/prometheus-dont-jailbreak
branch
from
e17a83f to
24d759b
Compare
Contributor
Author
|
@cdepillabout Thank you, fixed! |
Member
|
@GrahamcOfBorg build haskellPackages.prometheus @GrahamcOfBorg build prometheus |
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
2 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.
Motivation for this change
prometheusno longer needs to be jailbroken. Jailbreaking was added in prometheus: fix build #70956 to overcome issue Loosen http-client version bounds bitnomial/prometheus#34.Things done
Removed
doJailbreakoverride.sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)