commit acd9e87ebead3958782cc15fcdfb115a75af7265 · pyrox.dev/nixpkgs

+2 -10

nixos/modules/services/search/solr.nix

···

       13
       13
        
           services.solr = {

     

       14
       14
        
             enable = mkEnableOption "Solr";

     

       15
       15
        
       

     

       16
       16
       -
             # default to the 8.x series not forcing major version upgrade of those on the 7.x series

     

       17
       16
        
             package = mkOption {

     

       18
       17
        
               type = types.package;

     

       19
       19
       -
               default = if versionAtLeast config.system.stateVersion "19.09"

     

       20
       20
       -
                 then pkgs.solr_8

     

       21
       21
       -
                 else pkgs.solr_7

     

       22
       22
       -
               ;

     

       18
       18
       +
               default = pkgs.solr;

     

       23
       19
        
               defaultText = "pkgs.solr";

     

       24
       24
       -
               description = ''

     

       25
       25
       -
                 Which Solr package to use. This defaults to version 7.x if

     

       26
       26
       -
                 <literal>system.stateVersion &lt; 19.09</literal> and version 8.x

     

       27
       27
       -
                 otherwise.

     

       28
       28
       -
               '';

     

       20
       20
       +
               description = "Which Solr package to use.";

     

       29
       21
        
             };

     

       30
       22
        
       

     

       31
       23
        
             port = mkOption {

+42 -59

nixos/tests/solr.nix

···

       1
       1
       -
       { system ? builtins.currentSystem,

     

       2
       2
       -
         config ? {},

     

       3
       3
       -
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       -
       }:

     

       1
       1
       +
       import ./make-test.nix ({ pkgs, ... }:

     

       5
       2
        
       

     

       6
       6
       -
       with import ../lib/testing.nix { inherit system pkgs; };

     

       7
       7
       -
       with pkgs.lib;

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "solr";

     

       5
       5
       +
         meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];

     

       8
       6
        
       

     

       9
       9
       -
       let

     

       10
       10
       -
         solrTest = package: makeTest {

     

       11
       11
       -
           machine =

     

       12
       12
       -
             { config, pkgs, ... }:

     

       13
       13
       -
             {

     

       14
       14
       -
               # Ensure the virtual machine has enough memory for Solr to avoid the following error:

     

       15
       15
       -
               #

     

       16
       16
       -
               #   OpenJDK 64-Bit Server VM warning:

     

       17
       17
       -
               #     INFO: os::commit_memory(0x00000000e8000000, 402653184, 0)

     

       18
       18
       -
               #     failed; error='Cannot allocate memory' (errno=12)

     

       19
       19
       -
               #

     

       20
       20
       -
               #   There is insufficient memory for the Java Runtime Environment to continue.

     

       21
       21
       -
               #   Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory.

     

       22
       22
       -
               virtualisation.memorySize = 2000;

     

       7
       7
       +
         machine =

     

       8
       8
       +
           { config, pkgs, ... }:

     

       9
       9
       +
           {

     

       10
       10
       +
             # Ensure the virtual machine has enough memory for Solr to avoid the following error:

     

       11
       11
       +
             #

     

       12
       12
       +
             #   OpenJDK 64-Bit Server VM warning:

     

       13
       13
       +
             #     INFO: os::commit_memory(0x00000000e8000000, 402653184, 0)

     

       14
       14
       +
             #     failed; error='Cannot allocate memory' (errno=12)

     

       15
       15
       +
             #

     

       16
       16
       +
             #   There is insufficient memory for the Java Runtime Environment to continue.

     

       17
       17
       +
             #   Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory.

     

       18
       18
       +
             virtualisation.memorySize = 2000;

     

       23
       19
        
       

     

       24
       24
       -
               services.solr.enable = true;

     

       25
       25
       -
               services.solr.package = package;

     

       26
       26
       -
             };

     

       20
       20
       +
             services.solr.enable = true;

     

       21
       21
       +
           };

     

       27
       22
        
       

     

       28
       28
       -
           testScript = ''

     

       29
       29
       -
             startAll;

     

       23
       23
       +
         testScript = ''

     

       24
       24
       +
           startAll;

     

       30
       25
        
       

     

       31
       31
       -
             $machine->waitForUnit('solr.service');

     

       32
       32
       -
             $machine->waitForOpenPort('8983');

     

       33
       33
       -
             $machine->succeed('curl --fail http://localhost:8983/solr/');

     

       26
       26
       +
           $machine->waitForUnit('solr.service');

     

       27
       27
       +
           $machine->waitForOpenPort('8983');

     

       28
       28
       +
           $machine->succeed('curl --fail http://localhost:8983/solr/');

     

       34
       29
        
       

     

       35
       35
       -
             # adapted from pkgs.solr/examples/films/README.txt

     

       36
       36
       -
             $machine->succeed('sudo -u solr solr create -c films');

     

       37
       37
       -
             $machine->succeed(q(curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{

     

       38
       38
       -
               "add-field" : {

     

       39
       39
       -
                 "name":"name",

     

       40
       40
       -
                 "type":"text_general",

     

       41
       41
       -
                 "multiValued":false,

     

       42
       42
       -
                 "stored":true

     

       43
       43
       -
               },

     

       44
       44
       -
               "add-field" : {

     

       45
       45
       -
                 "name":"initial_release_date",

     

       46
       46
       -
                 "type":"pdate",

     

       47
       47
       -
                 "stored":true

     

       48
       48
       -
               }

     

       49
       49
       -
             }')) =~ /"status":0/ or die;

     

       50
       50
       -
             $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json');

     

       51
       51
       -
             $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die;

     

       52
       52
       -
           '';

     

       53
       53
       -
         };

     

       54
       54
       -
       in

     

       55
       55
       -
       {

     

       56
       56
       -
         solr_7 = solrTest pkgs.solr_7 // {

     

       57
       57
       -
           name = "solr_7";

     

       58
       58
       -
           meta.maintainers = [ lib.maintainers.aanderse ];

     

       59
       59
       -
         };

     

       60
       60
       -
       

     

       61
       61
       -
         solr_8 = solrTest pkgs.solr_8 // {

     

       62
       62
       -
           name = "solr_8";

     

       63
       63
       -
           meta.maintainers = [ lib.maintainers.aanderse ];

     

       64
       64
       -
         };

     

       65
       65
       -
       }

     

       30
       30
       +
           # adapted from pkgs.solr/examples/films/README.txt

     

       31
       31
       +
           $machine->succeed('sudo -u solr solr create -c films');

     

       32
       32
       +
           $machine->succeed(q(curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{

     

       33
       33
       +
             "add-field" : {

     

       34
       34
       +
               "name":"name",

     

       35
       35
       +
               "type":"text_general",

     

       36
       36
       +
               "multiValued":false,

     

       37
       37
       +
               "stored":true

     

       38
       38
       +
             },

     

       39
       39
       +
             "add-field" : {

     

       40
       40
       +
               "name":"initial_release_date",

     

       41
       41
       +
               "type":"pdate",

     

       42
       42
       +
               "stored":true

     

       43
       43
       +
             }

     

       44
       44
       +
           }')) =~ /"status":0/ or die;

     

       45
       45
       +
           $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json');

     

       46
       46
       +
           $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die;

     

       47
       47
       +
         '';

     

       48
       48
       +
       })

-35

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

···

       1
       1
       -
       { stdenv, fetchurl, jre, makeWrapper }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "solr";

     

       5
       5
       -
         version = "8.4.0";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";

     

       9
       9
       -
           sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       -
       

     

       14
       14
       -
         installPhase = ''

     

       15
       15
       -
           mkdir -p $out $out/bin

     

       16
       16
       -
       

     

       17
       17
       -
           cp -r bin/solr bin/post $out/bin/

     

       18
       18
       -
           cp -r contrib $out/

     

       19
       19
       -
           cp -r dist $out/

     

       20
       20
       -
           cp -r example $out/

     

       21
       21
       -
           cp -r server $out/

     

       22
       22
       -
       

     

       23
       23
       -
           wrapProgram $out/bin/solr --set JAVA_HOME "${jre}"

     

       24
       24
       -
           wrapProgram $out/bin/post --set JAVA_HOME "${jre}"

     

       25
       25
       -
         '';

     

       26
       26
       -
       

     

       27
       27
       -
         meta = with stdenv.lib; {

     

       28
       28
       -
           homepage = "https://lucene.apache.org/solr/";

     

       29
       29
       -
           description = "Open source enterprise search platform from the Apache Lucene project";

     

       30
       30
       -
           license = licenses.asl20;

     

       31
       31
       -
           platforms = platforms.all;

     

       32
       32
       -
           maintainers = with maintainers; [ domenkozar aanderse ];

     

       33
       33
       -
         };

     

       34
       34
       -
       

     

       35
       35
       -
       }

+4 -4

pkgs/servers/search/solr/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "solr";

     

       5
       5
       -
         version = "7.7.2";

     

       5
       5
       +
         version = "8.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";

     

       9
       9
       -
           sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb";

     

       8
       8
       +
           url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";

     

       9
       9
       +
           sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

     
···

       29
       29
        
           description = "Open source enterprise search platform from the Apache Lucene project";

     

       30
       30
        
           license = licenses.asl20;

     

       31
       31
        
           platforms = platforms.all;

     

       32
       32
       -
           maintainers = [ maintainers.domenkozar maintainers.aanderse ];

     

       32
       32
       +
           maintainers = with maintainers; [ domenkozar aanderse ];

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
       }

+3 -3

pkgs/top-level/all-packages.nix

···

       6453
       6453
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       6454
       6454
        
         };

     

       6455
       6455
        
       

     

       6456
       6456
       -
         solr = solr_8;

     

       6457
       6457
       -
         solr_7 = callPackage ../servers/search/solr { };

     

       6458
       6458
       -
         solr_8 = callPackage ../servers/search/solr/8.x.nix { };

     

       6456
       6456
       +
         solr = callPackage ../servers/search/solr { };

     

       6457
       6457
       +
         solr_7 = solr;

     

       6458
       6458
       +
         solr_8 = solr;

     

       6459
       6459
        
       

     

       6460
       6460
        
         solvespace = callPackage ../applications/graphics/solvespace { };

     

       6461
       6461