Merge pull request #13930 from grahamc/upgrade-activemq

activemq: 5.8.0 -> 5.13.2
This commit is contained in:
Robin Gloster 2016-03-15 03:51:30 +01:00
commit ad0bf29e87
4 changed files with 4 additions and 19 deletions

View File

@ -1,6 +0,0 @@
import ./recent.nix
rec {
version = "5.12.1";
sha256 = "1hn6pls12dzc2fngz6lji7kmz7blvd3z1dq4via8gd4fjflmw5c9";
mkUrl = name: "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
}

View File

@ -1,6 +0,0 @@
import ./recent.nix
rec {
version = "5.8.0";
sha256 = "12a1lmmqapviqdgw307jm07vw1z5q53r56pkbp85w9wnqwspjrbk";
mkUrl = name: "mirror://apache/activemq/apache-activemq/${version}/${name}-bin.tar.gz";
}

View File

@ -1,13 +1,12 @@
{ version, sha256, mkUrl }:
# use a function to make the source url, because the url schemes differ between 5.8.0 and greater
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "apache-activemq-${version}";
version = "5.13.2";
src = fetchurl {
url = mkUrl name;
inherit sha256;
sha256 = "0vrgny8fw973xvr3w4wc1s44z50b0c2hgcqa91s8fbx2yjmqn5xy";
url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
};
phases = [ "unpackPhase" "installPhase" ];

View File

@ -6406,9 +6406,7 @@ let
acl = callPackage ../development/libraries/acl { };
activemq = callPackage ../development/libraries/apache-activemq/5.8.nix { };
activemq512 = callPackage ../development/libraries/apache-activemq/5.12.nix { };
activemq = callPackage ../development/libraries/apache-activemq { };
adns = callPackage ../development/libraries/adns { };