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

Feature/prometheus dont jailbreak #82907

Conversation

sevanspowell
Copy link
Contributor

Motivation for this change
Things done

Removed doJailbreak override.

  • 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.

@cdepillabout
Copy link
Member

@GrahamcOfBorg build haskellPackages.prometheus

@cdepillabout
Copy link
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 sevanspowell force-pushed the feature/prometheus-dont-jailbreak branch from e17a83f to 24d759b Compare March 19, 2020 02:30
@sevanspowell
Copy link
Contributor Author

@cdepillabout Thank you, fixed!

@cdepillabout
Copy link
Member

@GrahamcOfBorg build haskellPackages.prometheus

@GrahamcOfBorg build prometheus

@cdepillabout cdepillabout merged commit c478305 into NixOS:haskell-updates Mar 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants