From 01555a629bfede04e33e15955ee9c2762bdaa301 Mon Sep 17 00:00:00 2001 From: makefu 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 ; gnupg imapfilter msmtp - mutt notmuch + neomutt offlineimap openssl w3m ]; + } -- cgit v1.3.1 From ca77ad48ee0046a330d1902a4c12464c7b928bb0 Mon Sep 17 00:00:00 2001 From: makefu 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.3.1 From 70260c70943cfcad80c268920566c1a858870b28 Mon Sep 17 00:00:00 2001 From: makefu 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.3.1 From 1ec7dabe6233ecec74a0b387f1e7851f55c72ad5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 18 Jun 2017 14:00:05 +0200 Subject: krebszones -> ovh-zone --- krebs/5pkgs/simple/krebszones/default.nix | 25 ------------------------- krebs/5pkgs/simple/ovh-zone/default.nix | 25 +++++++++++++++++++++++++ lass/1systems/mors.nix | 2 +- lass/2configs/buildbot-standalone.nix | 2 +- makefu/2configs/tools/dev.nix | 2 +- tv/2configs/default.nix | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 krebs/5pkgs/simple/krebszones/default.nix create mode 100644 krebs/5pkgs/simple/ovh-zone/default.nix (limited to 'makefu') diff --git a/krebs/5pkgs/simple/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix deleted file mode 100644 index 9230192bd..000000000 --- a/krebs/5pkgs/simple/krebszones/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, pkgs,python3Packages,fetchurl, ... }: - -# TODO: Prepare a diff of future and current -## ovh-zone export krebsco.de --config ~/secrets/krebs/cfg.json |sed 's/[ ]\+/ /g' | sort current -## sed 's/[ ]\+/ /g'/etc/zones/krebsco.de | sort > future -## diff future.sorted current.sorted - -python3Packages.buildPythonPackage rec { - name = "krebszones-${version}"; - version = "0.4.4"; - propagatedBuildInputs = with pkgs.python3Packages;[ - d2to1 # for setup to work - ovh - docopt - ]; - src = fetchurl { - url = "https://pypi.python.org/packages/source/k/krebszones/krebszones-${version}.tar.gz"; - sha256 = "1bzfc2b9468769j1yj93j12zdlccqbjiqfhql2larximh491sg4d"; - }; - meta = { - homepage = http://krebsco.de/; - description = "OVH Zone Upload"; - license = lib.licenses.wtfpl; - }; -} diff --git a/krebs/5pkgs/simple/ovh-zone/default.nix b/krebs/5pkgs/simple/ovh-zone/default.nix new file mode 100644 index 000000000..051a14e8d --- /dev/null +++ b/krebs/5pkgs/simple/ovh-zone/default.nix @@ -0,0 +1,25 @@ +{ lib, pkgs,python3Packages,fetchurl, ... }: + +# TODO: Prepare a diff of future and current +## ovh-zone export krebsco.de --config ~/secrets/krebs/cfg.json |sed 's/[ ]\+/ /g' | sort current +## sed 's/[ ]\+/ /g'/etc/zones/krebsco.de | sort > future +## diff future.sorted current.sorted + +python3Packages.buildPythonPackage rec { + name = "ovh-zone-${version}"; + version = "0.4.4"; + propagatedBuildInputs = with pkgs.python3Packages;[ + d2to1 # for setup to work + ovh + docopt + ]; + src = fetchurl { + url = "https://pypi.python.org/packages/source/k/krebszones/krebszones-${version}.tar.gz"; + sha256 = "1bzfc2b9468769j1yj93j12zdlccqbjiqfhql2larximh491sg4d"; + }; + meta = { + homepage = http://krebsco.de/; + description = "OVH Zone Upload"; + license = lib.licenses.wtfpl; + }; +} diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index dd3777c64..a5305c07c 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -76,7 +76,7 @@ with import ; } { environment.systemPackages = [ - pkgs.krebszones + pkgs.ovh-zone ]; } { diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 227152482..5edd1075d 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -178,11 +178,11 @@ in { "haskellPackages.scanner", "haskellPackages.xmonad-stockholm", "krebspaste", - "krebszones", "logf", "much", "newsbot-js", "noVNC", + "ovh-zone", "passwdqc-utils", "populate", "posix-array", 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 ]; } diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index b2560084d..b1d739ef3 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -155,7 +155,7 @@ with import ; environment.systemPackages = [ pkgs.get pkgs.krebspaste - pkgs.krebszones + pkgs.ovh-zone pkgs.nix-prefetch-scripts pkgs.push ]; -- cgit v1.3.1 [cgit] Unable to lock slot /tmp/cgit/a0200000.lock: No such file or directory (2)