diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-11-05 09:40:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-05 09:40:59 +0100 |
commit | dd851a8d75211df1ed898fb3db2a9348d52b8721 (patch) | |
tree | 98a6523a98c959d5c377ef69068fdb6b4b276159 /nixos | |
parent | f825642e7435bbd1eb7c3d777999606d8d628ce1 (diff) | |
parent | 7325ad9ab735424257b05a81e0c8197e4651e68f (diff) | |
download | nixlib-dd851a8d75211df1ed898fb3db2a9348d52b8721.tar nixlib-dd851a8d75211df1ed898fb3db2a9348d52b8721.tar.gz nixlib-dd851a8d75211df1ed898fb3db2a9348d52b8721.tar.bz2 nixlib-dd851a8d75211df1ed898fb3db2a9348d52b8721.tar.lz nixlib-dd851a8d75211df1ed898fb3db2a9348d52b8721.tar.xz nixlib-dd851a8d75211df1ed898fb3db2a9348d52b8721.tar.zst nixlib-dd851a8d75211df1ed898fb3db2a9348d52b8721.zip |
Merge pull request #31254 from LumiGuide/graphite-python-overrides
graphite: override django and django_tagging
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 645dfeab0193..4b1ad34b3a4e 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -467,7 +467,15 @@ in { ]; }) - (mkIf cfg.web.enable { + (mkIf cfg.web.enable (let + python27' = pkgs.python27.override { + packageOverrides = self: super: { + django = self.django_1_8; + django_tagging = self.django_tagging_0_4_3; + }; + }; + pythonPackages = python27'.pkgs; + in { systemd.services.graphiteWeb = { description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; @@ -477,8 +485,8 @@ in { PYTHONPATH = let penv = pkgs.python.buildEnv.override { extraLibs = [ - pkgs.python27Packages.graphite_web - pkgs.python27Packages.pysqlite + pythonPackages.graphite_web + pythonPackages.pysqlite ]; }; penvPack = "${penv}/${pkgs.python.sitePackages}"; @@ -516,17 +524,17 @@ in { fi # Only collect static files when graphite_web changes. - if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python27Packages.graphite_web}" ]; then + if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then mkdir -p ${staticDir} ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} - ln -sfT "${pkgs.python27Packages.graphite_web}" "${dataDir}/current_graphite_web" + ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web" fi ''; }; - environment.systemPackages = [ pkgs.python27Packages.graphite_web ]; - }) + environment.systemPackages = [ pythonPackages.graphite_web ]; + })) (mkIf cfg.api.enable { systemd.services.graphiteApi = { |