From 193cfe48d476ede39aa3399cf25263fbc1894639 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 22 Sep 2024 22:01:26 +0200
Subject: [PATCH 1/3] activemq: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../ac/activemq/package.nix}                  | 22 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 9 deletions(-)
 rename pkgs/{development/libraries/apache-activemq/default.nix => by-name/ac/activemq/package.nix} (55%)

diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/by-name/ac/activemq/package.nix
similarity index 55%
rename from pkgs/development/libraries/apache-activemq/default.nix
rename to pkgs/by-name/ac/activemq/package.nix
index 5543c12ac9ed..6788978e8d42 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/by-name/ac/activemq/package.nix
@@ -1,21 +1,29 @@
-{ lib, stdenv, fetchurl }:
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+}:
 
-stdenv.mkDerivation rec {
-  pname = "apache-activemq";
+stdenvNoCC.mkDerivation rec {
+  pname = "activemq";
   version = "6.1.2";
 
   src = fetchurl {
-    sha256 = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0=";
-    url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
+    url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz";
+    hash = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0=";
   };
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out
     mv * $out/
-    for j in `find $out/lib -name "*.jar"`; do
+    for j in $(find $out/lib -name "*.jar"); do
       cp="''${cp:+"$cp:"}$j";
     done
     echo "CLASSPATH=$cp" > $out/lib/classpath.env
+
+    runHook postInstall
   '';
 
   meta = {
@@ -23,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "Messaging and Integration Patterns server written in Java";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
+    mainProgram = "activemq";
     platforms = lib.platforms.unix;
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 757459aa5645..596efa36c982 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19005,8 +19005,6 @@ with pkgs;
 
   acsccid = callPackage ../tools/security/acsccid { };
 
-  activemq = callPackage ../development/libraries/apache-activemq { };
-
   adns = callPackage ../development/libraries/adns { };
 
   adslib = callPackage ../development/libraries/adslib { };

From d6f05e3a846768ecf9cafc2f69a68f5313cfbcd1 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 22 Sep 2024 22:05:54 +0200
Subject: [PATCH 2/3] activemq: 6.1.2 -> 6.1.3

https://activemq.apache.org/components/classic/download/classic-06-01-03
---
 pkgs/by-name/ac/activemq/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix
index 6788978e8d42..3cbb03d6b25e 100644
--- a/pkgs/by-name/ac/activemq/package.nix
+++ b/pkgs/by-name/ac/activemq/package.nix
@@ -4,13 +4,16 @@
   fetchurl,
 }:
 
-stdenvNoCC.mkDerivation rec {
+let
+  version = "6.1.3";
+in
+stdenvNoCC.mkDerivation {
   pname = "activemq";
-  version = "6.1.2";
+  inherit version;
 
   src = fetchurl {
     url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz";
-    hash = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0=";
+    hash = "sha256-ytFOgW6ZDxMScJ6/wij0KJXYxUxlLTzVbwtRRWNdx5Q=";
   };
 
   installPhase = ''

From b0a499578ca1afd075a1bf3597002b55f5416f47 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 22 Sep 2024 22:07:40 +0200
Subject: [PATCH 3/3] activemq: add anthonyroussel to maintainers

---
 pkgs/by-name/ac/activemq/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix
index 3cbb03d6b25e..81a6b540f232 100644
--- a/pkgs/by-name/ac/activemq/package.nix
+++ b/pkgs/by-name/ac/activemq/package.nix
@@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation {
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
     mainProgram = "activemq";
+    maintainers = [ lib.maintainers.anthonyroussel ];
     platforms = lib.platforms.unix;
   };
 }