From c2c6b7fe3b0e4637ff0ce738390191bf09ffa872 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 21 Oct 2015 13:15:57 +0200
Subject: [PATCH 1/2] activemq: prepare nix files for multiple versions

---
 pkgs/development/libraries/apache-activemq/5.8.nix         | 6 ++++++
 .../libraries/apache-activemq/{default.nix => recent.nix}  | 7 ++++---
 pkgs/top-level/all-packages.nix                            | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/apache-activemq/5.8.nix
 rename pkgs/development/libraries/apache-activemq/{default.nix => recent.nix} (75%)

diff --git a/pkgs/development/libraries/apache-activemq/5.8.nix b/pkgs/development/libraries/apache-activemq/5.8.nix
new file mode 100644
index 000000000000..7e4644895e96
--- /dev/null
+++ b/pkgs/development/libraries/apache-activemq/5.8.nix
@@ -0,0 +1,6 @@
+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/default.nix b/pkgs/development/libraries/apache-activemq/recent.nix
similarity index 75%
rename from pkgs/development/libraries/apache-activemq/default.nix
rename to pkgs/development/libraries/apache-activemq/recent.nix
index 2f2792dec140..a69880233433 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/recent.nix
@@ -1,12 +1,13 @@
+{ 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.8.0";
 
   src = fetchurl {
-    url = "mirror://apache/activemq/apache-activemq/${version}/${name}-bin.tar.gz";
-    sha256 = "12a1lmmqapviqdgw307jm07vw1z5q53r56pkbp85w9wnqwspjrbk";
+    url = mkUrl name;
+    inherit sha256;
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d87029b7153..8f10895d9d9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5981,7 +5981,7 @@ let
 
   acl = callPackage ../development/libraries/acl { };
 
-  activemq = callPackage ../development/libraries/apache-activemq { };
+  activemq = callPackage ../development/libraries/apache-activemq/5.8.nix { };
 
   adns = callPackage ../development/libraries/adns { };
 

From 9c668d847fdbd97100718fa86c3161570e89f6f4 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 21 Oct 2015 13:16:28 +0200
Subject: [PATCH 2/2] activemq: Add 5.12.1 version

---
 pkgs/development/libraries/apache-activemq/5.12.nix | 6 ++++++
 pkgs/top-level/all-packages.nix                     | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100644 pkgs/development/libraries/apache-activemq/5.12.nix

diff --git a/pkgs/development/libraries/apache-activemq/5.12.nix b/pkgs/development/libraries/apache-activemq/5.12.nix
new file mode 100644
index 000000000000..e2e3af96532a
--- /dev/null
+++ b/pkgs/development/libraries/apache-activemq/5.12.nix
@@ -0,0 +1,6 @@
+import ./recent.nix
+  rec {
+    version = "5.12.1";
+    sha256 = "1hn6pls12dzc2fngz6lji7kmz7blvd3z1dq4via8gd4fjflmw5c9";
+    mkUrl = name: "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f10895d9d9b..ce8ddb862e5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5983,6 +5983,8 @@ let
 
   activemq = callPackage ../development/libraries/apache-activemq/5.8.nix { };
 
+  activemq512 = callPackage ../development/libraries/apache-activemq/5.12.nix { };
+
   adns = callPackage ../development/libraries/adns { };
 
   afflib = callPackage ../development/libraries/afflib { };