diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-27 18:12:29 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-27 18:12:29 +0100 |
| commit | a85114c59c5102b839584f72454bca2c8abbb887 (patch) | |
| tree | 18fc24394171f4afae3dee0e68e3781df75723ea /krebs/5pkgs | |
| parent | fe4f5b98b91f6bacb036d57b5322fb4e09c22f14 (diff) | |
| parent | 20ad77468131b7c69c5b3a26ea149ae7fdc0173b (diff) | |
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/default.nix | 9 | ||||
| -rw-r--r-- | krebs/5pkgs/tinc_graphs/default.nix | 26 |
2 files changed, 32 insertions, 3 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 84fb8725b..7df7b7d3c 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: - -with import ../4lib { inherit (pkgs) lib; }; +{ lib, pkgs, ... }: +with lib; let subdirs = mapAttrs (_: flip pkgs.callPackage {}) (subdirsOf ./.); pkgs' = pkgs // subdirs; @@ -55,4 +54,8 @@ subdirs // rec { gcc -O -Wall -o "$exe" $src strip --strip-unneeded "$exe" ''; + + writeNixFromCabal = name: path: pkgs.runCommand name {} '' + ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out + ''; } diff --git a/krebs/5pkgs/tinc_graphs/default.nix b/krebs/5pkgs/tinc_graphs/default.nix new file mode 100644 index 000000000..e5f1e40e8 --- /dev/null +++ b/krebs/5pkgs/tinc_graphs/default.nix @@ -0,0 +1,26 @@ +{stdenv,fetchurl,pkgs,python3Packages, ... }: + +python3Packages.buildPythonPackage rec { + name = "tinc_graphs-${version}"; + version = "0.3.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 = "0hjmkiclvyjb3707285x4b8mk5aqjcvh383hvkad1h7p1n61qrfx"; + }; + 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; + }; +} + |