From 1e3b34fb5f01d0dc763636c562b28374220e39c0 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 6 Sep 2020 15:02:21 +0100
Subject: [PATCH] elasticmq: remove in favour of elasticmq-server

the elasticmq package is very old and hasn't seen any non-automatic updates
since its introduction. newer releases are packaged as elasticmq-server
---
 pkgs/servers/elasticmq/default.nix | 40 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 pkgs/top-level/all-packages.nix    |  4 ---
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/servers/elasticmq/default.nix

diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix
deleted file mode 100644
index b27a8decb5e..00000000000
--- a/pkgs/servers/elasticmq/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenv, fetchurl, jre, makeWrapper, which }:
-
-stdenv.mkDerivation rec {
-  name = "elasticmq-0.5";
-
-  src = fetchurl {
-    url = "https://github.com/downloads/adamw/elasticmq/${name}.tar.gz";
-    sha256 = "1zpv3vzairprh4x9fia82qqr14kf5hpxq1r90mn4ww7ighbv9pf1";
-  };
-
-  buildInputs = [ makeWrapper ];
-
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp -prd lib conf $out/
-
-      cp bin/run.sh $out/bin/elasticmq
-      substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}'
-
-      wrapProgram $out/bin/elasticmq --prefix PATH : "${lib.makeBinPath [ which jre ]}"
-    '';
-
-  meta = {
-    homepage = "https://github.com/adamw/elasticmq";
-    description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces";
-    longDescription =
-      ''
-        ElasticMQ is a message queueing system with Java, Scala and
-        Amazon SQS-compatible interfaces.  You should set the
-        environment ELASTICMQ_DATA_PREFIX to a writable directory
-        where ElasticMQ will store its data and log files.  It also
-        looks for its configuration file in
-        $ELASTICMQ_DATA_PREFIX/conf/Default.scala.  You can use the
-        Default.scala included in the distribution as a template.
-      '';
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d5374158a10..189992db802 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -139,6 +139,7 @@ mapAliases ({
   draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
   dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
+  elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
   emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
   emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
   emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5396d4d32b..8219a60f320 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17668,10 +17668,6 @@ in
 
   biboumi = callPackage ../servers/xmpp/biboumi { };
 
-  elasticmq = callPackage ../servers/elasticmq {
-    jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  };
-
   elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731