From 98e22ae7da764225b5b111a54436c70fedfca5df Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 4 Oct 2015 16:42:55 +0200 Subject: makefu 5 tinc_graphs: bump version --- makefu/5pkgs/default.nix | 2 +- makefu/5pkgs/tinc_graphs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 15dab1100..b78183a2a 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -4,7 +4,7 @@ let inherit (pkgs) callPackage; in { - alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; + alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; tinc_graphs = callPackage ./tinc_graphs {}; diff --git a/makefu/5pkgs/tinc_graphs/default.nix b/makefu/5pkgs/tinc_graphs/default.nix index c35a8b02e..d0a998f6b 100644 --- a/makefu/5pkgs/tinc_graphs/default.nix +++ b/makefu/5pkgs/tinc_graphs/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonPackage rec { name = "tinc_graphs-${version}"; - version = "0.2.8"; + version = "0.2.9"; propagatedBuildInputs = with pkgs;[ python3Packages.pygeoip ## ${geolite-legacy}/share/GeoIP/GeoIPCity.dat -- cgit v1.2.3 From d768877c3447c5e54c69f386187414bcf51ce0b0 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 4 Oct 2015 18:55:08 +0200 Subject: m 5 tinc_graphs: fix path for tinc caller --- makefu/5pkgs/tinc_graphs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'makefu/5pkgs') diff --git a/makefu/5pkgs/tinc_graphs/default.nix b/makefu/5pkgs/tinc_graphs/default.nix index d0a998f6b..95f096a30 100644 --- a/makefu/5pkgs/tinc_graphs/default.nix +++ b/makefu/5pkgs/tinc_graphs/default.nix @@ -9,10 +9,12 @@ python3Packages.buildPythonPackage rec { ]; src = fetchurl { url = "https://pypi.python.org/packages/source/t/tinc_graphs/tinc_graphs-${version}.tar.gz"; - sha256 = "1rvy07ybjpqlsf9qizdp0zyq4ibd6w74k4glbbkw0x7j3j2skzdk"; + sha256 = "0fm063qhjlb8g1xahwcqqrd2dxgd38wwi55rhl1k5chr7zajsqfz"; }; preFixup = with pkgs;'' - wrapProgram $out/bin/build-graphs --prefix PATH : "${imagemagick}/bin:${graphviz}/bin" + 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/; -- cgit v1.2.3