Merge branch master into x-updates (fix eval)

nixos/modules/services/search/solr.nix

@@ -6,6 +6,26 @@ let
 
   cfg = config.services.solr;
 
+  # Assemble all jars needed for solr
+  solrJars = pkgs.stdenv.mkDerivation {
+    name = "solr-jars";
+
+    src = pkgs.fetchurl {
+      url = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/bin/apache-tomcat-5.5.36.tar.gz;
+      sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
+    };
+
+    buildPhases = [ "unpackPhase" "installPhase" ];
+
+    installPhase = ''
+      mkdir -p $out/lib
+      cp common/lib/*.jar $out/lib/
+      ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/
+      ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/
+      ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/
+    '';
+  };
+
 in {
 
   options = {
@@ -101,7 +121,8 @@ in {
       inherit (cfg) user group javaPackage;
       warFile = "${cfg.solrPackage}/lib/solr.war";
       extraOptions = [
-        "--commonLibFolder=${cfg.solrPackage}/lib/ext"
+        "--commonLibFolder=${solrJars}/lib"
+        "--useJasper"
       ] ++ cfg.extraWinstoneOptions;
       extraJavaOptions = [
         "-Dsolr.solr.home=${cfg.solrHome}"

pkgs/applications/networking/irc/weechat/default.nix

@@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
       cacert cmake
     ];
 
+  # This patch is based on
+  # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes
+  # freeze/crash on /exit when using nixpkgs' gnutls 3.2. The next
+  # weechat release (0.4.4) will include this, so it's safe to remove
+  # then.
+  patches = [ ./fix-gnutls-32.diff ];
+
   postInstall = ''
        wrapProgram "$out/bin/weechat" \
          --prefix PYTHONPATH : "$PYTHONPATH" \

pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff

@@ -0,0 +1,16 @@
+diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
+index 325c611..a8927bc 100644
+--- a/src/gui/curses/CMakeLists.txt
++++ b/src/gui/curses/CMakeLists.txt
+@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+   ENDIF(HAVE_BACKTRACE)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ 
+-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+-  LIST(APPEND EXTRA_LIBS "pthread")
+-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++LIST(APPEND EXTRA_LIBS "pthread")
+ 
+ IF(ICONV_LIBRARY)
+   LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
+

pkgs/servers/amqp/rabbitmq-server/default.nix

@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.2.1";
+  version = "3.2.4";
 
   src = fetchurl {
     url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
-    sha256 = "0j9yx64sdgkv0h20zjs65aa2ag6wwv50i6hd3x69m0cc6shzcc0f";
+    sha256 = "17rvqhzcb7rscp228vmgixk0rsqi42m820jzxj9g5wid6qmzjc59";
   };
 
   buildInputs =

pkgs/servers/http/tomcat/6.0.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "6.0.37"; in
+let version = "6.0.39"; in
 
 stdenv.mkDerivation rec {
   name = "apache-tomcat-${version}";
 
   src = fetchurl {
     url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
-    sha256 = "000v63amhbyp8nkw3a4pff1vm4nxri5n9j7rknhnqaxzab3sp49y";
+    sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
   };
 
   installPhase =

pkgs/servers/search/elasticsearch/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, makeWrapper, jre, utillinux }:
 stdenv.mkDerivation rec {
-  name = "elasticsearch-1.0.0";
+  name = "elasticsearch-1.0.1";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "06ym7hl47339a5dav2hawnxv820y0lbvh9xxd0lfp1f815vbql01";
+    sha256 = "0nwv7llw7gk94alfcpxxy0lybhnw7fggv30v7ylsxn20id9g7kba";
   };
 
   patches = [ ./es-home.patch ];

pkgs/tools/networking/telnet/default.nix

@@ -4,7 +4,8 @@ stdenv.mkDerivation {
   name = "telnet-1.2";
 
   src = fetchurl {
-    url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2;
+    #url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; # broken
+    url = mirror://gentoo/distfiles/telnet-bsd-1.2.tar.bz2;
     sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn";
   };
 

pkgs/top-level/all-packages.nix

@@ -3237,6 +3237,7 @@ let
     suitesparse = null;
     openjdk = null;
     gnuplot = null;
+    readline = readline63;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     fltk = fltk13;
@@ -3857,6 +3858,7 @@ let
 
   gdb = callPackage ../development/tools/misc/gdb {
     hurd = gnu.hurdCross;
+    readline = readline63;
     inherit (gnu) mig;
   };
 
@@ -6767,6 +6769,7 @@ let
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
     inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = [];
   };
 
   grsecurityOverrider = args: {
@@ -9213,10 +9216,7 @@ let
     graphicsSupport = false;
   };
 
-  weechat = callPackage ../applications/networking/irc/weechat {
-    # weechat doesn't exit with gnutls32. Use 3.1 for now.
-    gnutls = gnutls31;
-  };
+  weechat = callPackage ../applications/networking/irc/weechat { };
 
   weston = callPackage ../applications/window-managers/weston { };