From b48109ca9bac8b703dcd4ae0c22260d8fb82090d Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 21 May 2019 20:28:02 -0400
Subject: [PATCH 1/2] solr: 8.0.0 -> 8.1.0

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

diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix
index 00821e6e40ae..f5671c6b4651 100644
--- a/pkgs/servers/search/solr/8.x.nix
+++ b/pkgs/servers/search/solr/8.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchurl {
     url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
-    sha256 = "04hxj7nfmbh5wfqkq1p5q2ncxszwm80l218vfdy93aw0p79r4qqf";
+    sha256 = "1w8hc2694c3acs4hqk0rkl3lmv4sbnji9n5mzw1piq90azlmnb1a";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0890f8d743b7d9614d0d868dd9f1c7994f7eb3a1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 21 May 2019 20:29:19 -0400
Subject: [PATCH 2/2] solr: minor cleanup/formatting

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

diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix
index f5671c6b4651..28808a00a7cf 100644
--- a/pkgs/servers/search/solr/8.x.nix
+++ b/pkgs/servers/search/solr/8.x.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "8.1.0";
 
   src = fetchurl {
-    url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
+    url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
     sha256 = "1w8hc2694c3acs4hqk0rkl3lmv4sbnji9n5mzw1piq90azlmnb1a";
   };
 
@@ -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.rickynils maintainers.domenkozar maintainers.aanderse ];
+    maintainers = with maintainers; [ rickynils domenkozar aanderse ];
   };
 
 }