public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91756 from JJJollyjim/fix-graphite-web-patch

Browse Source 
graphite-web: fix patch
This commit is contained in:
Lancelot SIX 2020-06-30 08:26:35 +01:00 committed by GitHub
commit a3db82fe45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/tests/graphite.nix
View File

@ -1,11 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... } : import ./make-test-python.nix ({ pkgs, ... } :
{ {
name = "graphite"; name = "graphite";
meta = {
# Fails on dependency `python-2.7-Twisted`'s test suite
# complaining `ImportError: No module named zope.interface`.
broken = true;
};
nodes = { nodes = {
one = one =
{ ... }: { { ... }: {
@ -21,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... } :
api = { api = {
enable = true; enable = true;
port = 8082; port = 8082;
finders = [ pkgs.python3Packages.influxgraph ]; finders = [ ];
}; };
carbon.enableCache = true; carbon.enableCache = true;
seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure
@ -41,10 +36,14 @@ import ./make-test-python.nix ({ pkgs, ... } :
# even if they're still in preStart (which takes quite long for graphiteWeb). # even if they're still in preStart (which takes quite long for graphiteWeb).
# Wait for ports to open so we're sure the services are up and listening. # Wait for ports to open so we're sure the services are up and listening.
one.wait_for_open_port(8080) one.wait_for_open_port(8080)
one.wait_for_open_port(8082)
one.wait_for_open_port(2003) one.wait_for_open_port(2003)
one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003')
one.wait_until_succeeds( one.wait_until_succeeds(
"curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"
) )
one.wait_until_succeeds(
"curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"
)
''; '';
}) })

15
pkgs/development/python-modules/graphite-web/update-django-tagging.patch
View File

@ -1,12 +1,13 @@
diff -Nur a/setup.py b/setup.py diff --git a/setup.py b/setup.py
--- a/setup.py 2020-03-12 18:45:34.654296302 +0100 index a1a21f1..f0d1051 100644
+++ b/setup.py 2020-03-12 18:46:17.476893828 +0100 --- a/setup.py
@@ -115,7 +115,7 @@ +++ b/setup.py
@@ -117,7 +117,7 @@ try:
['templates/*', 'local_settings.py.example']}, ['templates/*', 'local_settings.py.example']},
scripts=glob('bin/*'), scripts=glob('bin/*'),
data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
- install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], - install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz',
+ install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], + install_requires=['Django>=1.8,<3.1', 'django-tagging==0.5.0', 'pytz',
'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
classifiers=[ classifiers=[
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'Natural Language :: English',