Merge branch 'master' of pnp:stockholm
This commit is contained in:
commit
ff8ddc1a0f
|
@ -32,6 +32,8 @@
|
|||
|
||||
# ../2configs/graphite-standalone.nix
|
||||
];
|
||||
krebs.urlwatch.verbose = true;
|
||||
|
||||
krebs.Reaktor.enable = true;
|
||||
krebs.Reaktor.debug = true;
|
||||
krebs.Reaktor.nickname = "Reaktor|bot";
|
||||
|
|
|
@ -50,7 +50,7 @@ in {
|
|||
# TODO: remove hard-coded hostname
|
||||
complete = {
|
||||
listen = [ "${internal-ip}:80" ];
|
||||
server-names = [ "graphs.wry" ];
|
||||
server-names = [ "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
|
||||
};
|
||||
anonymous = {
|
||||
listen = [ "${external-ip}:80" ] ;
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
https://api.github.com/repos/ovh/python-ovh/tags
|
||||
https://api.github.com/repos/embray/d2to1/tags
|
||||
http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
|
||||
https://github.com/bepasty/bepasty-server/tags
|
||||
https://pypi.python.org/simple/xstatic/
|
||||
|
||||
];
|
||||
};
|
||||
|
|
|
@ -7,6 +7,5 @@ in
|
|||
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 {};
|
||||
awesomecfg = callPackage ./awesomecfg {};
|
||||
}
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
{stdenv,fetchurl,pkgs,python3Packages, ... }:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
name = "tinc_graphs-${version}";
|
||||
version = "0.3.6";
|
||||
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 = "0ghdx9aaipmppvc2b6cgks4nxw6zsb0fhjrmnisbx7rz0vjvzc74";
|
||||
};
|
||||
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";
|
||||
license = stdenv.lib.licenses.wtfpl;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in a new issue