From 01555a629bfede04e33e15955ee9c2762bdaa301 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 6 Jun 2017 14:42:58 +0200
Subject: m 2 mail-clients: mutt -> neomutt

---
 makefu/2configs/mail-client.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/2configs/mail-client.nix b/makefu/2configs/mail-client.nix
index 8319b89ce..e08aadc5e 100644
--- a/makefu/2configs/mail-client.nix
+++ b/makefu/2configs/mail-client.nix
@@ -7,10 +7,11 @@ with import <stockholm/lib>;
     gnupg
     imapfilter
     msmtp
-    mutt
     notmuch
+    neomutt
     offlineimap
     openssl
     w3m
   ];
+
 }
-- 
cgit v1.2.3


From ca77ad48ee0046a330d1902a4c12464c7b928bb0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 6 Jun 2017 18:56:02 +0200
Subject: m 2 led-fader: trying to fix mosquitto deps

---
 makefu/1systems/wry.nix                  | 4 ++--
 makefu/2configs/deployment/led-fader.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 62ca171a9..f5097bf40 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -22,8 +22,8 @@ in {
       # ../2configs/nginx/euer.test.nix
 
       # collectd
-      ../2configs/logging/central-stats-client.nix
-      ../2configs/logging/central-logging-client.nix
+      ../2configs/stats/client.nix
+      ../2configs/logging/client.nix
 
       ../2configs/tinc/retiolum.nix
       # ../2configs/torrent.nix
diff --git a/makefu/2configs/deployment/led-fader.nix b/makefu/2configs/deployment/led-fader.nix
index e4d62ae77..50023693d 100644
--- a/makefu/2configs/deployment/led-fader.nix
+++ b/makefu/2configs/deployment/led-fader.nix
@@ -29,7 +29,7 @@ in {
     environment = {
       NIX_PATH = "/var/src";
     };
-    after = [ (lib.optional config.services.mosqitto.enable "mosquitto.service") ];
+    # after = [ (lib.optional config.services.mosqitto.enable "mosquitto.service") ];
     wantedBy = [ "multi-user.target"  ];
     serviceConfig = {
       # User = "nobody"; # need a user with permissions to run nix-shell
-- 
cgit v1.2.3


From 70260c70943cfcad80c268920566c1a858870b28 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 15 Jun 2017 13:01:16 +0200
Subject: m 5 studio-link: init

---
 makefu/5pkgs/studio-link/default.nix | 69 ++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 makefu/5pkgs/studio-link/default.nix

(limited to 'makefu')

diff --git a/makefu/5pkgs/studio-link/default.nix b/makefu/5pkgs/studio-link/default.nix
new file mode 100644
index 000000000..6fa40139b
--- /dev/null
+++ b/makefu/5pkgs/studio-link/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
+, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
+, nss, pango, systemd, xorg, utillinuxMinimal, unzip, openssl, zlib, libjack2 }:
+
+let
+  libPath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gcc.cc
+    gdk_pixbuf
+    glib
+    gnome2.GConf
+    gtk2
+    nspr
+    nss
+    pango
+
+    openssl
+    zlib
+    libjack2
+
+    systemd
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+  ];
+in
+stdenv.mkDerivation rec {
+  name = "studio-link-${version}";
+  version = "17.03.1-beta";
+  src = fetchurl {
+    url = "https://github.com/Studio-Link-v2/backend/releases/download/v${version}/studio-link-standalone-linux.zip";
+    sha256 = "1y21nymin7iy64hcffc8g37fv305b1nvmh944hkf7ipb06kcx6r9";
+  };
+  buildInputs = [ unzip ];
+  phases = ["unpackPhase" "installPhase" "fixupPhase"];
+  unpackPhase = ''
+    unzip $src
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp studio-link-standalone $out/bin/studio-link
+    chmod +x $out/bin/studio-link
+  '';
+  postFixup = ''
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/bin/studio-link"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://studio-link.com;
+    description = "Voip transfer";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ makefu ];
+  };
+}
-- 
cgit v1.2.3


From 1ec7dabe6233ecec74a0b387f1e7851f55c72ad5 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 18 Jun 2017 14:00:05 +0200
Subject: krebszones -> ovh-zone

---
 makefu/2configs/tools/dev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 8e4e3270d..4fe7f8bf4 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -11,6 +11,6 @@
     esptool
     cac-api
     cac-panel
-    krebszones
+    ovh-zone
   ];
 }
-- 
cgit v1.2.3