Merge master into x-updates

3 files changed, 23 insertions, 6 deletions

diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index a543aa32eea5..791763ced362 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
+{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
 
 stdenv.mkDerivation rec {
-  name = "opus-tools-0.1.6";
+  name = "opus-tools-0.1.8";
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc";
+    sha256 = "1xm2lhdz92n9zmk496lyagisyzja46kx8q340vay9i51krbqiqg4";
   };
 
-  buildInputs = [ libogg libao pkgconfig libopus ];
+  buildInputs = [ libogg libao pkgconfig libopus flac ];
 
   meta = {
     description = "Tools to work with opus encoded audio streams";
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
new file mode 100644
index 000000000000..50df35b974f6
--- /dev/null
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}:
+
+stdenv.mkDerivation rec {
+  name = "opusfile-0.4";
+  src = fetchurl {
+    url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
+    sha256 = "0h4iwyqgid0cibqwzckz3r94qfp09099nk1cx5nz6i3cf08yldlq";
+  };
+
+  buildInputs = [ pkgconfig openssl libogg libopus ];
+
+  meta = {
+    description = "High-level API for decoding and seeking in .opus files";
+    homepage = http://www.opus-codec.org/;
+    license = "BSD";
+  };
+}
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index e70d51ce857c..1531fd87b952 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.9";
+  version = "0.3.10";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
+    sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw";
   };
 
   buildInputs = [ qt4 alsaLib jackaudio dbus ];