From 9bf3a190d158bbda66a4c80e5ac3d818dd1217fa Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 5 Oct 2015 11:55:11 +0200 Subject: update tinc_graphs with new dependencies --- retiolum/scripts/adv_graphgen/tinc_graphs.nix | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/tinc_graphs.nix b/retiolum/scripts/adv_graphgen/tinc_graphs.nix index 3d5a5f68..7b98113b 100644 --- a/retiolum/scripts/adv_graphgen/tinc_graphs.nix +++ b/retiolum/scripts/adv_graphgen/tinc_graphs.nix @@ -6,23 +6,20 @@ with import {}; python3Packages.buildPythonPackage rec { name = "tinc_graphs-${version}"; - version = "0.2.6"; + version = "0.2.12"; propagatedBuildInputs = with pkgs;[ - graphviz - imagemagick - librsvg - libpng - - # optional if you want geolocation: python3Packages.pygeoip - # geolite-legacy for the db: ## ${geolite-legacy}/share/GeoIP/GeoIPCity.dat ]; - #src = fetchurl { - #url = ""; - #sha256 = "1dksw1s1n2hxvnga6pygkr174dywncr0wiggkrkn1srbn2amh1c2"; - #}; - src = ./.; + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/tinc_graphs/tinc_graphs-${version}.tar.gz"; + sha256 = "03jxvxahpcbpnz4668x32b629dwaaz5jcjkyaijm0zzpgcn4cbgp"; + }; + preFixup = with pkgs;'' + wrapProgram $out/bin/build-graphs --prefix PATH : "$out/bin" + wrapProgram $out/bin/all-the-graphs --prefix PATH : "${imagemagick}/bin:${graphviz}/bin:$out/bin" + wrapProgram $out/bin/tinc-stats2json --prefix PATH : "${tinc}/bin" + ''; meta = { homepage = http://krebsco.de/; description = "Create Graphs from Tinc Stats"; -- cgit v1.2.3