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/servers | |
| 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/servers')
| -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 |
3 files changed, 6 insertions, 6 deletions
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 ]; |