From 7e8a510f351b1d180df3795ecf1af3559f9a3c0c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 7 Jun 2015 21:48:20 +0200
Subject: Version bump in trivmix

---
 bragi.nix              | 18 +++---------------
 customized/trivmix.nix | 10 +++++-----
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index 918ed068..ea074065 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -1,16 +1,6 @@
 { config, pkgs, ... }:
-let
-  makemix = (n: {
-    wantedBy = [ "sound.target" ];
-    requires = [ "jack.service" ];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.trivmix}/bin/trivmix --client mix --input 'in_${n}' --output 'out_${n}' --dir /run/jackmix_${n}";
-      User = "jack";
-      Group = "audio";
-    };
-  });
-in {
+
+{
   imports =
     [
       ./bragi-hw.nix
@@ -68,6 +58,7 @@ in {
     tmux
     nfs-utils
     jack2
+    trivmix
   ];
 
   # List services that you want to enable:
@@ -102,9 +93,6 @@ in {
     };
   };
 
-  systemd.services."trivmix_0" = (makemix "0");
-  systemd.services."trivmix_1" = (makemix "1");
-  
   services.mpd = {
     enable = true;
     musicDirectory = "/media/odin/music";
diff --git a/customized/trivmix.nix b/customized/trivmix.nix
index 6c4417fd..6be839eb 100644
--- a/customized/trivmix.nix
+++ b/customized/trivmix.nix
@@ -1,22 +1,22 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, filepath, hinotify, jack, optparseApplicative
+, transformers, explicitException
 , fetchgit
-, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "trivmix";
-  version = "0.1.0";
+  version = "0.2.0";
   src = fetchgit {
     url = git://git.yggdrasil.li/trivmix;
-    rev = "5e46af12608b35b73b7ac1f83e59585671d19e48";
-    sha256 = "4e78ddb3a3118ac99f64a927cc3166e2c5b898ac31242ec7b5494d8efd3e8ec4";
+    rev = "4e78ddb3a3118ac99f64a927cc3166e2c5b898ac31242ec7b5494d8efd3e8ec4";
+    sha256 = "495004dfe17f85d370b7f5237d5e71b367af98ca";
   };
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    filepath hinotify jack optparseApplicative transformers
+    filepath hinotify jack optparseApplicative transformers explicitException
   ];
   meta = {
     license = self.stdenv.lib.licenses.publicDomain;
-- 
cgit v1.2.3