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: activemq: prepare nix files for multiple versions

---
 pkgs/development/libraries/apache-activemq/5.8.nix |  6 +++++
 .../libraries/apache-activemq/default.nix          | 29 ---------------------
 .../libraries/apache-activemq/recent.nix           | 30 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 +-
 4 files changed, 37 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/libraries/apache-activemq/5.8.nix
 delete mode 100644 pkgs/development/libraries/apache-activemq/default.nix
 create mode 100644 pkgs/development/libraries/apache-activemq/recent.nix

(limited to 'pkgs')

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/default.nix
deleted file mode 100644
index 2f2792dec140..000000000000
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ 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";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out
-    mv * $out/
-    for j in `find $out/lib -name "*.jar"`; do
-      cp="''${cp:+"$cp:"}$j";
-    done
-    echo "CLASSPATH=$cp" > $out/lib/classpath.env
-  '';
-
-  meta = {
-    homepage = http://activemq.apache.org/;
-    description = "Messaging and Integration Patterns server written in Java";
-    license = stdenv.lib.licenses.asl20;
-  };
-
-}
diff --git a/pkgs/development/libraries/apache-activemq/recent.nix b/pkgs/development/libraries/apache-activemq/recent.nix
new file mode 100644
index 000000000000..a69880233433
--- /dev/null
+++ b/pkgs/development/libraries/apache-activemq/recent.nix
@@ -0,0 +1,30 @@
+{ 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}";
+
+  src = fetchurl {
+    url = mkUrl name;
+    inherit sha256;
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    mv * $out/
+    for j in `find $out/lib -name "*.jar"`; do
+      cp="''${cp:+"$cp:"}$j";
+    done
+    echo "CLASSPATH=$cp" > $out/lib/classpath.env
+  '';
+
+  meta = {
+    homepage = http://activemq.apache.org/;
+    description = "Messaging and Integration Patterns server written in Java";
+    license = stdenv.lib.licenses.asl20;
+  };
+
+}
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 { };
 
-- 
cgit 1.4.1