diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-09 22:46:14 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-09 22:46:14 +0200 |
| commit | d432b75d0e96b5f9bf2fe97968910c060bb095bf (patch) | |
| tree | 319494e014eea13e47a2e7c4648a8cc614737c01 | |
| parent | 0e7612f4b72e9fc78259563a7f7dd2f5ec914e2c (diff) | |
| download | nixos-d432b75d0e96b5f9bf2fe97968910c060bb095bf.tar nixos-d432b75d0e96b5f9bf2fe97968910c060bb095bf.tar.gz nixos-d432b75d0e96b5f9bf2fe97968910c060bb095bf.tar.bz2 nixos-d432b75d0e96b5f9bf2fe97968910c060bb095bf.tar.xz nixos-d432b75d0e96b5f9bf2fe97968910c060bb095bf.zip | |
Trivmix bump
| -rw-r--r-- | custom/trivmix-service.nix | 2 | ||||
| -rw-r--r-- | custom/trivmix.nix | 6 | ||||
| m--------- | trivmix | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix index b61ec977..99439042 100644 --- a/custom/trivmix-service.nix +++ b/custom/trivmix-service.nix | |||
| @@ -37,7 +37,7 @@ in rec { | |||
| 37 | requires = [ "jack.service" ]; | 37 | requires = [ "jack.service" ]; |
| 38 | serviceConfig = { | 38 | serviceConfig = { |
| 39 | Type = "simple"; | 39 | Type = "simple"; |
| 40 | ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun} --level /dev/shm/mix/${name}/level${if ! isNull group then " --dir /dev/shm/mix/${group}/level" else ""}''; | 40 | ExecStart = ''${trivmix}/bin/trivmix --client ${name} --run ${genRun} /dev/shm/mix/${name}/level${if ! isNull group then " /dev/shm/mix/${group}/level" else ""}''; |
| 41 | User = "jack"; | 41 | User = "jack"; |
| 42 | Group = "audio"; | 42 | Group = "audio"; |
| 43 | }; | 43 | }; |
diff --git a/custom/trivmix.nix b/custom/trivmix.nix index b0408f8c..f4ea72dd 100644 --- a/custom/trivmix.nix +++ b/custom/trivmix.nix | |||
| @@ -7,11 +7,11 @@ | |||
| 7 | 7 | ||
| 8 | cabal.mkDerivation (self: { | 8 | cabal.mkDerivation (self: { |
| 9 | pname = "trivmix"; | 9 | pname = "trivmix"; |
| 10 | version = "2.0.0"; | 10 | version = "2.1.0"; |
| 11 | src = fetchgit { | 11 | src = fetchgit { |
| 12 | url = git://git.yggdrasil.li/trivmix; | 12 | url = git://git.yggdrasil.li/trivmix; |
| 13 | rev = "60cc6cf218d8f1a12360d0188450f83e04d92c1a"; | 13 | rev = "8bb5a7da733ee6da42b2b968a1c9fb70631e14a8"; |
| 14 | sha256 = "327c886d0cd5adfe3fcb4a5f2fa00522de4a046aa72c447d3ae96288ce765ce9"; | 14 | sha256 = "28c406c1d3fa9e11cfe0cbc0eb9f0c487353f19b409e24cfdab604458f1662c2"; |
| 15 | }; | 15 | }; |
| 16 | isLibrary = false; | 16 | isLibrary = false; |
| 17 | isExecutable = true; | 17 | isExecutable = true; |
diff --git a/trivmix b/trivmix | |||
| Subproject fcbabab1057b010cfd861d441931476ae6096e3 | Subproject 3a69e87a90d494aff3d187de2174cc1e92c331b | ||