From 2be76d8b48956e8e6d848e705c55db7243f56a96 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 14 Mar 2016 20:56:07 -0500
Subject: [PATCH] activemq: 5.8.0 -> 5.13.2

It seems Activemq was "split" in to 5.8.0 and 5.12.1 only to keep from
trampling someone on 5.8.0. This is to the point of not upgrading the
default, but making a new activemq attribute specific for 512.

As far as I can tell, there is no good reason to stay providing 5.8.0,
so this is the proposal to delete it.

Note: There are over 1,000 fixes between 5.9.0 to 5.13.2.
---
 pkgs/development/libraries/apache-activemq/5.12.nix        | 6 ------
 pkgs/development/libraries/apache-activemq/5.8.nix         | 6 ------
 .../libraries/apache-activemq/{recent.nix => default.nix}  | 7 +++----
 pkgs/top-level/all-packages.nix                            | 4 +---
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/apache-activemq/5.12.nix
 delete mode 100644 pkgs/development/libraries/apache-activemq/5.8.nix
 rename pkgs/development/libraries/apache-activemq/{recent.nix => default.nix} (76%)

diff --git a/pkgs/development/libraries/apache-activemq/5.12.nix b/pkgs/development/libraries/apache-activemq/5.12.nix
deleted file mode 100644
index e2e3af96532a..000000000000
--- a/pkgs/development/libraries/apache-activemq/5.12.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-import ./recent.nix
-  rec {
-    version = "5.12.1";
-    sha256 = "1hn6pls12dzc2fngz6lji7kmz7blvd3z1dq4via8gd4fjflmw5c9";
-    mkUrl = name: "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
-  }
diff --git a/pkgs/development/libraries/apache-activemq/5.8.nix b/pkgs/development/libraries/apache-activemq/5.8.nix
deleted file mode 100644
index 7e4644895e96..000000000000
--- a/pkgs/development/libraries/apache-activemq/5.8.nix
+++ /dev/null
@@ -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";
-  }
diff --git a/pkgs/development/libraries/apache-activemq/recent.nix b/pkgs/development/libraries/apache-activemq/default.nix
similarity index 76%
rename from pkgs/development/libraries/apache-activemq/recent.nix
rename to pkgs/development/libraries/apache-activemq/default.nix
index a69880233433..0e3a1ccd3c48 100644
--- a/pkgs/development/libraries/apache-activemq/recent.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -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" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9de7c9defaf7..fd443f56843b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };