diff options
| author | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
| commit | 04c0f3935b257ab3cd396a5274f691e982c8dba3 (patch) | |
| tree | 6dc76859ba10e4a231b34d14b0ed39cb23585073 /makefu/5pkgs | |
| parent | 41df3589f6f3aab31443a486a9d7e82f4e9ff559 (diff) | |
| parent | b5977c92b3c3daa8023f4df1070a240617125019 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/5pkgs')
| -rw-r--r-- | makefu/5pkgs/default.nix | 2 | ||||
| -rw-r--r-- | makefu/5pkgs/tinc_graphs/default.nix | 8 |
2 files changed, 6 insertions, 4 deletions
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..95f096a30 100644 --- a/makefu/5pkgs/tinc_graphs/default.nix +++ b/makefu/5pkgs/tinc_graphs/default.nix @@ -2,17 +2,19 @@ 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 ]; 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/; |