solr: drop 7.x series

nixos/modules/services/search/solr.nix

@@ -13,19 +13,11 @@ in
     services.solr = {
       enable = mkEnableOption "Solr";
 
-      # default to the 8.x series not forcing major version upgrade of those on the 7.x series
       package = mkOption {
         type = types.package;
-        default = if versionAtLeast config.system.stateVersion "19.09"
+        default = pkgs.solr;
-          then pkgs.solr_8
-          else pkgs.solr_7
-        ;
         defaultText = "pkgs.solr";
-        description = ''
+        description = "Which Solr package to use.";
-          Which Solr package to use. This defaults to version 7.x if
-          <literal>system.stateVersion &lt; 19.09</literal> and version 8.x
-          otherwise.
-        '';
       };
 
       port = mkOption {

nixos/tests/solr.nix

@@ -1,13 +1,9 @@
-{ system ? builtins.currentSystem,
+import ./make-test.nix ({ pkgs, ... }:
-  config ? {},
-  pkgs ? import ../.. { inherit system config; }
-}:
 
-with import ../lib/testing.nix { inherit system pkgs; };
+{
-with pkgs.lib;
+  name = "solr";
+  meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
 
-let
-  solrTest = package: makeTest {
   machine =
     { config, pkgs, ... }:
     {
@@ -22,7 +18,6 @@ let
       virtualisation.memorySize = 2000;
 
       services.solr.enable = true;
-        services.solr.package = package;
     };
 
   testScript = ''
@@ -50,16 +45,4 @@ let
     $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json');
     $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die;
   '';
-  };
+})
-in
-{
-  solr_7 = solrTest pkgs.solr_7 // {
-    name = "solr_7";
-    meta.maintainers = [ lib.maintainers.aanderse ];
-  };
-
-  solr_8 = solrTest pkgs.solr_8 // {
-    name = "solr_8";
-    meta.maintainers = [ lib.maintainers.aanderse ];
-  };
-}

pkgs/servers/search/solr/8.x.nix

@@ -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 ];
-  };
-
-}

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";
+    url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb";
+    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 ];
   };
 
 }

pkgs/top-level/all-packages.nix

@@ -6453,9 +6453,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  solr = solr_8;
+  solr = callPackage ../servers/search/solr { };
-  solr_7 = callPackage ../servers/search/solr { };
+  solr_7 = solr;
-  solr_8 = callPackage ../servers/search/solr/8.x.nix { };
+  solr_8 = solr;
 
   solvespace = callPackage ../applications/graphics/solvespace { };