summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/maintainers.nix2
-rw-r--r--pkgs/applications/audio/svox/default.nix43
-rw-r--r--pkgs/applications/editors/tiled/default.nix35
-rw-r--r--pkgs/applications/graphics/sane/backends/git.nix6
-rw-r--r--pkgs/applications/networking/mumble/default.nix33
-rw-r--r--pkgs/development/libraries/speechd/default.nix33
-rw-r--r--pkgs/games/dwarf-fortress/unfuck.nix10
-rw-r--r--pkgs/tools/networking/aria2/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix2
9 files changed, 111 insertions, 59 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9d9caa776d6..63b79ccab0b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -254,7 +254,7 @@
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
-  obadz = "obadz <dav-nixos@odav.org>";
+  obadz = "obadz <nixos@obadz.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
new file mode 100644
index 00000000000..f8258dd10ab
--- /dev/null
+++ b/pkgs/applications/audio/svox/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "svox-${version}";
+  version = "2016-01-25";
+
+  src = fetchgit {
+    url = "https://android.googlesource.com/platform/external/svox";
+    rev = "dfb9937746b1828d093faf3b1494f9dc403f392d";
+    sha256 = "1gkfj5avikzmr2vv8bhf83n15jcbz4phz5j13l0qnh3gjzh4f1bk";
+  };
+
+  postPatch = ''
+    cd pico
+  '';
+
+  buildPhase = ''
+    cd lib
+    for i in *.c; do
+      $CC -O2 -fPIC -c -o ''${i%.c}.o $i
+    done
+    $CC -shared -o libttspico.so *.o
+    cd ..
+  '';
+
+  installPhase = ''
+    install -Dm755 lib/libttspico.so $out/lib/libttspico.so
+    mkdir -p $out/include
+    cp lib/*.h $out/include
+    mkdir -p $out/share/pico/lang
+    cp lang/*.bin $out/share/pico/lang
+  '';
+
+  NIX_CFLAGS_COMPILE = [ "-include stdint.h" ];
+
+  meta = with stdenv.lib; {
+    description = "Text-to-speech engine";
+    homepage = https://android.googlesource.com/platform/external/svox;
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index e4b2f0461c2..201db054743 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, qtbase, qttools, qmakeHook, pkgconfig, python }:
+{ stdenv, fetchurl, pkgconfig, qmakeHook
+, python, qtbase, qttools, zlib }:
 
 let
-  version = "0.12.3";
-  sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40";
-in
-
-stdenv.mkDerivation rec {
+#  qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
+in stdenv.mkDerivation rec {
   name = "tiled-${version}";
+  version = "0.16.0";
 
   src = fetchurl {
+    name = "${name}.tar.gz";
     url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
-    inherit sha256;
+    sha256 = "1vlhfkgl126irp53xw94jw1xnj96l1hwnbxmm1s5az60460gfbf0";
   };
 
-  buildInputs = [ qtbase qttools qmakeHook pkgconfig python ];
+  nativeBuildInputs = [ pkgconfig qmakeHook ];
+  buildInputs = [ python qtbase qttools ];
+
+  enableParallelBuilding = true;
 
-  meta = {
-    description = "A free, easy to use and flexible tile map editor";
-    homepage = "http://www.mapeditor.org/";
-    # libtiled and tmxviewer is licensed under 2-calause BSD license.
-    # The rest is GPL2 or later.
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Free, easy to use and flexible tile map editor";
+    homepage = http://www.mapeditor.org/;
+    license = with licenses; [
+      bsd2	# libtiled and tmxviewer
+      gpl2Plus	# all the rest
+    ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index d7d512d8def..182c99dc2d0 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-04-20";
+  version = "2016-04-23";
   src = fetchgit {
-    sha256 = "f4a20eb41d72ff5961484ef164df44805a987523153107cc6f45acfb3d0208e2";
-    rev = "4b2f171a13248a8e3d79379e368c54fb71ed97e2";
+    sha256 = "11bf60cd5a6b314e855a69a6f57a5ca0db3254527def55662bce25810a2314df";
+    rev = "c8169b1e656f7f95c67946298da5a0e1c143f8e8";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 20a32159520..88b9ae49efd 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -80,6 +80,8 @@ let
       "CONFIG+=no-server"
     ];
 
+    NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher";
+
     installPhase = ''
       cp scripts/mumble-overlay $out/bin
       sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
@@ -108,44 +110,25 @@ let
   };
 
   stableSource = rec {
-    version = "1.2.10";
+    version = "1.2.15";
     qtVersion = 4;
 
     src = fetchurl {
       url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
-      sha256 = "012vm0xf84x13414jlsx964c5a1nwnbn41jnspkciajlxxipldn6";
+      sha256 = "1yjywzybgq23ry5s2yihggs13ffrphhwl6rlp6lq79rkwvafa9v5";
     };
   };
 
   gitSource = rec {
-    version = "1.3.0-git-2015-11-08";
+    version = "1.3.0-git-2016-04-10";
     qtVersion = 5;
 
+    # Needs submodules
     src = fetchgit {
       url = "https://github.com/mumble-voip/mumble";
-      rev = "72038f6aa038f5964e2bba5a09d3d391d4680e5f";
-      sha256 = "03978b85f7y0bffl8vwkmakjnxxjqapfz3pn0b8zf3b1ppwjy9g4";
-    };
-
-    # TODO: Remove fetchgit as it requires git
-    /*src = fetchFromGitHub {
-      owner = "mumble-voip";
-      repo = "mumble";
-      rev = "13e494c60beb20748eeb8be126b27e1226d168c8";
-      sha256 = "024my6wzahq16w7fjwrbksgnq98z4jjbdyy615kfyd9yk2qnpl80";
+      rev = "0502fa67b036bae9f07a586d9f05a8bf74c24291";
+      sha256 = "073v8nway17j1n1lm70x508722b1q3vb6h4fvmcbbma3d22y1h45";
     };
-
-    theme = fetchFromGitHub {
-      owner = "mumble-voip";
-      repo = "mumble-theme";
-      rev = "16b61d958f131ca85ab0f601d7331601b63d8f30";
-      sha256 = "0rbh825mwlh38j6nv2sran2clkiwvzj430mhvkdvzli9ysjxgsl3";
-    };
-
-    prePatch = ''
-      rmdir themes/Mumble
-      ln -s ${theme} themes/Mumble
-    '';*/
   };
 in {
   mumble     = client stableSource;
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index 5104532ea91..613fee3c6d6 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -1,20 +1,37 @@
-{ fetchurl, stdenv, dotconf, glib, pkgconfig }:
+{ fetchurl, lib, stdenv, intltool, libtool, pkgconfig, glib, dotconf, libsndfile
+, libao, python3Packages
+, withEspeak ? false, espeak
+, withPico ? true, svox
+}:
 
 stdenv.mkDerivation rec {
-  name = "speech-dispatcher-" + version;
-  version = "0.7.1";
+  name = "speech-dispatcher-${version}";
+  version = "0.8.3";
 
   src = fetchurl {
     url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz";
-    sha256 = "0laag72iw03545zggdzcr860b8q7w1vrjr3csd2ldps7jhlwzad8";
+    sha256 = "0kqy7z4l59n2anc7xn588w4rkacig1hajx8c53qrh90ypar978ln";
   };
 
-  buildInputs = [ dotconf glib pkgconfig ];
+  buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ]
+             ++ lib.optional withEspeak espeak
+             ++ lib.optional withPico svox;
+  nativeBuildInputs = [ pkgconfig python3Packages.wrapPython ];
 
-  meta = {
-    description = "Common interface to speech synthesis";
+  pythonPath = with python3Packages; [ pyxdg ];
+
+  postPatch = lib.optionalString withPico ''
+    sed -i 's,/usr/share/pico/lang/,${svox}/share/pico/lang/,g' src/modules/pico.c
+  '';
 
+  postInstall = ''
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Common interface to speech synthesis";
     homepage = http://www.freebsoft.org/speechd;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 57b0e458cc2..598f795083b 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, cmake
 , mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft
-, ncurses, glib, gtk2, libsndfile
+, ncurses, glib, gtk2, libsndfile, zlib
 }:
 
 stdenv.mkDerivation {
-  name = "dwarf_fortress_unfuck-2016-02-11";
+  name = "dwarf_fortress_unfuck-2016-04-22";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "dwarf_fortress_unfuck";
-    rev = "2ba59c87bb63bea598825a73bdc896b0e041e2d5";
-    sha256 = "0q2rhigvaabdknmb2c84gg71qz7xncmx04npzx4bki9avyxsrpcl";
+    rev = "dde40a2c619eac119b6db1bcd0c8d8612472f866";
+    sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i";
   };
 
   cmakeFlags = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     mesa SDL SDL_image SDL_ttf glew openalSoft
-    ncurses gtk2 libsndfile
+    ncurses gtk2 libsndfile zlib
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 189be8be9e2..01c6500b143 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchurl {
     url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz";
-    sha256 = "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12";
+    sha256 = "12agwdvvkr34wqhyyfp418dj0k7nbr297qmcd3wj5kkn7brv6gxc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/tatsuhiro-t/aria2;
     description = "A lightweight, multi-protocol, multi-source, command-line download utility";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f939096cc5e..a959341fe35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12593,6 +12593,8 @@ in
 
   quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
 
+  svox = callPackage ../applications/audio/svox { };
+
   gkrellm = callPackage ../applications/misc/gkrellm { };
 
   gmu = callPackage ../applications/audio/gmu { };
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-17 15:53:34 +0000