From acd9e87ebead3958782cc15fcdfb115a75af7265 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 18 Jan 2020 08:31:43 -0500
Subject: solr: drop 7.x series

---
 pkgs/servers/search/solr/8.x.nix     | 35 -----------------------------------
 pkgs/servers/search/solr/default.nix |  8 ++++----
 2 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/servers/search/solr/8.x.nix

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix
deleted file mode 100644
index db70aadf8d5..00000000000
--- a/pkgs/servers/search/solr/8.x.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  pname = "solr";
-  version = "8.4.0";
-
-  src = fetchurl {
-    url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out $out/bin
-
-    cp -r bin/solr bin/post $out/bin/
-    cp -r contrib $out/
-    cp -r dist $out/
-    cp -r example $out/
-    cp -r server $out/
-
-    wrapProgram $out/bin/solr --set JAVA_HOME "${jre}"
-    wrapProgram $out/bin/post --set JAVA_HOME "${jre}"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://lucene.apache.org/solr/";
-    description = "Open source enterprise search platform from the Apache Lucene project";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ domenkozar aanderse ];
-  };
-
-}
diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index c94b11c91dd..db70aadf8d5 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "7.7.2";
+  version = "8.4.0";
 
   src = fetchurl {
-    url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
-    sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb";
+    url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
+    sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Open source enterprise search platform from the Apache Lucene project";
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = [ maintainers.domenkozar maintainers.aanderse ];
+    maintainers = with maintainers; [ domenkozar aanderse ];
   };
 
 }
-- 
cgit 1.4.1


From 19185c54ad5f8dcaf2a22e6f3f831b254f2f1a30 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 18 Jan 2020 08:55:40 -0500
Subject: solr: specify NixOS test

---
 pkgs/servers/search/solr/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index db70aadf8d5..a3e2e177cc4 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, jre, makeWrapper, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "solr";
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/post --set JAVA_HOME "${jre}"
   '';
 
+  passthru.tests = {
+    inherit (nixosTests) solr;
+  };
+
   meta = with stdenv.lib; {
     homepage = "https://lucene.apache.org/solr/";
     description = "Open source enterprise search platform from the Apache Lucene project";
-- 
cgit 1.4.1


From 1093736abb435796d5ce0d804f6ec49ba8dff7b1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 18 Jan 2020 09:00:04 -0500
Subject: solr: 8.4.0 -> 8.4.1

---
 pkgs/servers/search/solr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index a3e2e177cc4..701d3880cbd 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "8.4.0";
+  version = "8.4.1";
 
   src = fetchurl {
     url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";
+    sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
cgit 1.4.1