solr: drop 7.x series

2020-01-18 08:50:35 -05:00
parent 1177bce848
commit acd9e87ebe
5 changed files with 54 additions and 114 deletions
@@ -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"
-          then pkgs.solr_8
-          else pkgs.solr_7
-        ;
+        default = pkgs.solr;
        defaultText = "pkgs.solr";
-        description = ''
-          Which Solr package to use. This defaults to version 7.x if
-          <literal>system.stateVersion &lt; 19.09</literal> and version 8.x
-          otherwise.
-        '';
+        description = "Which Solr package to use.";
      };

      port = mkOption {