diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-21 13:46:56 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-21 13:46:56 +0100 |
commit | 1941168c3d4c03441a92093dfb7be4ae507711ae (patch) | |
tree | 8112d4a885e908da1a15bd85eca9bf5164ef9c23 /pkgs | |
parent | 65155c20d585eb1d3b2084cac23303d9ad61b0b9 (diff) | |
parent | f3f6f04c7d64030fdaaf97cdd381c23b3faeae0b (diff) | |
download | nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.gz nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.bz2 nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.lz nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.xz nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.zst nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.zip |
Merge branch master into x-updates (fix eval)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/irc/weechat/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff | 16 | ||||
-rw-r--r-- | pkgs/servers/amqp/rabbitmq-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/6.0.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/telnet/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
7 files changed, 35 insertions, 11 deletions
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 89b437acc905..b47018e0d970 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/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" \ diff --git a/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff new file mode 100644 index 000000000000..56e357c8f7dc --- /dev/null +++ b/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}) + diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 4bb05a23fafc..45a6c2189db6 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/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 = diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index d8304ba4dbee..ee0049ce08f6 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/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 = diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 165a01517b43..c6939ce5f7a4 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/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 ]; diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index c0dbf710ffb9..9827b62c6c4a 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/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"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10faa642844e..c345848b2a05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; |