diff options
author | Aaron Andersen <aaron@fosslib.net> | 2020-01-25 11:11:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-25 11:11:13 -0500 |
commit | 0e0b8f2feb813cbd6ae1d670201b616579c24067 (patch) | |
tree | dfd6d6a205fed8062a715499b4fbdfa361a3a282 /pkgs | |
parent | b305cd8d6f9da11e3325f0c1cc4278c0a4a1ced9 (diff) | |
parent | 1093736abb435796d5ce0d804f6ec49ba8dff7b1 (diff) | |
download | nixpkgs-0e0b8f2feb813cbd6ae1d670201b616579c24067.tar nixpkgs-0e0b8f2feb813cbd6ae1d670201b616579c24067.tar.gz nixpkgs-0e0b8f2feb813cbd6ae1d670201b616579c24067.tar.bz2 nixpkgs-0e0b8f2feb813cbd6ae1d670201b616579c24067.tar.lz nixpkgs-0e0b8f2feb813cbd6ae1d670201b616579c24067.tar.xz nixpkgs-0e0b8f2feb813cbd6ae1d670201b616579c24067.tar.zst nixpkgs-0e0b8f2feb813cbd6ae1d670201b616579c24067.zip |
Merge pull request #77983 from aanderse/solr
solr: 8.4.0 -> 8.4.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/search/solr/8.x.nix | 35 | ||||
-rw-r--r-- | pkgs/servers/search/solr/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 12 insertions, 43 deletions
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..701d3880cbd 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "solr"; - version = "7.7.2"; + version = "8.4.1"; src = fetchurl { - url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb"; + url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; + sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,12 +24,16 @@ 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"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.domenkozar maintainers.aanderse ]; + maintainers = with maintainers; [ domenkozar aanderse ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8517f4be3a3..01275b02866 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6490,9 +6490,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - solr = solr_8; - solr_7 = callPackage ../servers/search/solr { }; - solr_8 = callPackage ../servers/search/solr/8.x.nix { }; + solr = callPackage ../servers/search/solr { }; + solr_7 = solr; + solr_8 = solr; solvespace = callPackage ../applications/graphics/solvespace { }; |