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.

Sign up for GitHub

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

Jump to bottom

nixos/graphite: fix + cleanups #83005

Merged
merged 8 commits into from Mar 23, 2020
Merged

nixos/graphite: fix + cleanups #83005

merged 8 commits into from Mar 23, 2020

Conversation

lsix
Copy link
Member

@lsix lsix commented Mar 20, 2020 •
edited

Motivation for this change

Graphite was heavely broken, and did depend on django-1.8.

This PR revives it, and makes it migrate to python3.

This PR also closes #52679

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.

cc @danderson

@lsix lsix requested a review from danderson March 20, 2020 16:16
@lsix
Copy link
Member Author

lsix commented Mar 20, 2020

This PR also replaces #82371 which should be closed if this one is accepted.

danderson
danderson approved these changes Mar 20, 2020
View reviewed changes
Copy link
Contributor

@danderson danderson left a comment

Choose a reason for hiding this comment

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

Thanks for bringing this module up to date!

Change LGTM, with some minor suggestions.

nixos/modules/services/monitoring/graphite.nix Show resolved Hide resolved
nixos/tests/graphite.nix Outdated Show resolved Hide resolved
@lsix lsix requested a review from danderson March 21, 2020 18:18
@danderson
Copy link
Contributor

LGTM! Very excited to close that longstanding CVE bug :)

jonringer
jonringer approved these changes Mar 23, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM

[13 built, 13 copied (51.2 MiB), 7.7 MiB DL]
https://github.com/NixOS/nixpkgs/pull/83005
1 package blacklisted:
tests.nixos-functions.nixos-test

10 package built:
python27Packages.carbon python27Packages.txamqp python37Packages.carbon python37Packages.graphite-web python37Packages.txamqp python37Packages.waitress-django python38Packages.carbon python38Packages.graphite-web python38Packages.txamqp python38Packages.waitress-django

trusting the other reviewers and @lsix that the service works as intended

@jonringer jonringer merged commit 2a5a719 into NixOS:master Mar 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@basvandijk basvandijk Awaiting requested review from basvandijk

@danderson danderson Awaiting requested review from danderson

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: python 8.has: clean-up 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Django 1.8 is EOL
3 participants
@lsix @danderson @jonringer