From 642583145200f5a2cb8be1b38707e2b2ea3dc3e5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 25 Oct 2015 21:54:59 +0100
Subject: k 3 tinc_graphs: is now completely self-contained

---
 makefu/5pkgs/tinc_graphs/default.nix | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 makefu/5pkgs/tinc_graphs/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/tinc_graphs/default.nix b/makefu/5pkgs/tinc_graphs/default.nix
deleted file mode 100644
index 62a787d30..000000000
--- a/makefu/5pkgs/tinc_graphs/default.nix
+++ /dev/null
@@ -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;
-  };
-}
-
-- 
cgit v1.2.3


From cb1b101dfa2c8e0aa9a3ef0c64788912e0148085 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 26 Oct 2015 00:02:51 +0100
Subject: tinc_graphs: clean up mv {makefu,krebs}

---
 makefu/5pkgs/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 7945b6ebd..b9661e1cd 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -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 {};
 }
-- 
cgit v1.2.3


From 6147e3069ac3df5c4c652c47d2c1ee459493d784 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Oct 2015 17:43:36 +0100
Subject: m 5 tw-upload-plugin: init

---
 makefu/5pkgs/default.nix                  | 1 +
 makefu/5pkgs/tw-upload-plugin/default.nix | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 makefu/5pkgs/tw-upload-plugin/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index b9661e1cd..436c52fcd 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -8,4 +8,5 @@ in
   alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
   alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
   awesomecfg = callPackage ./awesomecfg {};
+  tw-upload-plugin = callPackage ./tw-upload-plugin {};
 }
diff --git a/makefu/5pkgs/tw-upload-plugin/default.nix b/makefu/5pkgs/tw-upload-plugin/default.nix
new file mode 100644
index 000000000..e73aea585
--- /dev/null
+++ b/makefu/5pkgs/tw-upload-plugin/default.nix
@@ -0,0 +1,8 @@
+{pkgs}:
+
+pkgs.fetchFromGitHub {
+  owner = "makefu";
+  repo = "tw-upload-plugin";
+  rev = "4a99de";
+  sha256 = "0y7bqzi4fmm3lxb7pbgicph5r31xlvkkz4a1pklsrb7vjwsyb91m";
+}
-- 
cgit v1.2.3


From 23424a3a2ae7fd489547c453374d6ffc551c5483 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Oct 2015 21:27:39 +0100
Subject: m 5 tw-upload-plugin: use new version

---
 makefu/5pkgs/tw-upload-plugin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/tw-upload-plugin/default.nix b/makefu/5pkgs/tw-upload-plugin/default.nix
index e73aea585..a68dc09dc 100644
--- a/makefu/5pkgs/tw-upload-plugin/default.nix
+++ b/makefu/5pkgs/tw-upload-plugin/default.nix
@@ -3,6 +3,6 @@
 pkgs.fetchFromGitHub {
   owner = "makefu";
   repo = "tw-upload-plugin";
-  rev = "4a99de";
-  sha256 = "0y7bqzi4fmm3lxb7pbgicph5r31xlvkkz4a1pklsrb7vjwsyb91m";
+  rev = "a00aac";
+  sha256 = "0kazqs24kzjxqzr33kg1jbfx8xyvmrnrdxh6g27kgkgbl1d2qknh";
 }
-- 
cgit v1.2.3