summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorRobert Schütz <dev@schuetz-co.de>2021-01-30 12:07:05 +0100
committerRobert Schütz <dev@schuetz-co.de>2021-01-30 12:07:05 +0100
commit9ff3bd475a883df0c6ec3e2a2982b55b26e58dae (patch)
tree5ac87dd65ac607481c26eb3cff0f68dd3e3e14e2 /pkgs/top-level
parent44c8df7e2a8dd9edb3304de5f54a0c7fdec7c331 (diff)
solr: clean up aliases
Since solr_7 actually refers to version 8, it is removed. The alias solr_8 is moved to aliases.nix.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 22ceedfe4e10..0d37e1235545 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -609,6 +609,7 @@ mapAliases ({
smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
+ solr_8 = solr; # added 2021-01-30
spectral = neochat; # added 2020-12-27
sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 172406ec7104..f7c74d2f01ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7911,8 +7911,6 @@ in
sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { };
solr = callPackage ../servers/search/solr { };
- solr_7 = solr;
- solr_8 = solr;
solvespace = callPackage ../applications/graphics/solvespace { };