commit f9bca2bcab7e6dcc885f652da9b78350b24e62f9 · pyrox.dev/nixpkgs

+4 -1

nixos/modules/services/search/tika.nix

···

       79
       79
        
       

     

       80
       80
        
             serviceConfig =

     

       81
       81
        
               let

     

       82
       82
       -
                 package = cfg.package.override { inherit (cfg) enableOcr; };

     

       82
       82
       +
                 package = cfg.package.override {

     

       83
       83
       +
                   inherit (cfg) enableOcr;

     

       84
       84
       +
                   enableGui = false;

     

       85
       85
       +
                 };

     

       83
       86
        
               in

     

       84
       87
        
               {

     

       85
       88
        
                 Type = "simple";

+53 -15

pkgs/by-name/ti/tika/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         maven,

     

       5
       5
       -
         jdk8,

     

       5
       5
       +
         jdk17,

     

       6
       6
       +
         jre17_minimal,

     

       6
       7
        
         fetchFromGitHub,

     

       7
       8
        
         makeWrapper,

     

       8
       9
        
         mvnDepsHash ? null,

     

       10
       10
       +
         enableGui ? true,

     

       9
       11
        
         enableOcr ? true,

     

       12
       12
       +
         runCommand,

     

       10
       13
        
         tesseract,

     

       11
       14
        
         nixosTests,

     

       12
       15
        
       }:

     

       13
       16
        
       

     

       14
       17
        
       let

     

       15
       18
        
         mvnDepsHashes = {

     

       16
       16
       -
           "x86_64-linux" = "sha256-a2EIxok7Ov2QQntu3fpagzvMAQcBjKwcd1whDNdCm2E=";

     

       17
       17
       -
           "aarch64-linux" = "sha256-TUJmlnFJeYY4Pzrmd+9uKb07Tq7HYd4EnAXkbgGCFDk=";

     

       18
       18
       -
           "x86_64-darwin" = "sha256-OTctUd4lsH6Z6H7rDYbyAcrBmzpSzFELjPBRN8zUyhY=";

     

       19
       19
       -
           "aarch64-darwin" = "sha256-0tNFHEaxAEqrZTTrGCIX53K9MczkqIuDABD/bB6R1KU=";

     

       19
       19
       +
           "x86_64-linux" = "sha256-OTd51n6SSlFziqvvHmfyMAyQRwIzsHxFGuJ62zlX1Ec=";

     

       20
       20
       +
           "aarch64-linux" = "sha256-tPaGLqm0jgEoz0BD/C6AG9xupovQvib/v0kB/jjqwB8=";

     

       21
       21
       +
           "x86_64-darwin" = "sha256-Rs7nTiGazUW8oJJr6fbJKelzFqd2n278sJYoMy2/0N4=";

     

       22
       22
       +
           "aarch64-darwin" = "sha256-gnP+G33LPRMQ6HRzeZ8cEV9oSohrlPcMwlBB4rvH7+E=";

     

       20
       23
        
         };

     

       21
       24
        
       

     

       22
       25
        
         knownMvnDepsHash =

     

       23
       26
        
           mvnDepsHashes.${stdenv.system}

     

       24
       27
        
             or (lib.warn "This platform doesn't have a default mvnDepsHash value, you'll need to specify it manually" lib.fakeHash);

     

       28
       28
       +
       

     

       29
       29
       +
         jdk = jre17_minimal.override {

     

       30
       30
       +
           modules = [

     

       31
       31
       +
             "java.base"

     

       32
       32
       +
             "java.desktop"

     

       33
       33
       +
             "java.logging"

     

       34
       34
       +
             "java.management"

     

       35
       35
       +
             "java.naming"

     

       36
       36
       +
             "java.sql"

     

       37
       37
       +
           ];

     

       38
       38
       +
           jdk = jdk17;

     

       39
       39
       +
         };

     

       25
       40
        
       in

     

       26
       41
        
       maven.buildMavenPackage rec {

     

       27
       42
        
         pname = "tika";

     
···

       43
       58
        
           "org.junit.platform:junit-platform-launcher:1.10.0"

     

       44
       59
        
         ];

     

       45
       60
        
       

     

       46
       46
       -
         mvnJdk = jdk8;

     

       61
       61
       +
         mvnJdk = jdk17;

     

       47
       62
        
         mvnHash = if mvnDepsHash != null then mvnDepsHash else knownMvnDepsHash;

     

       48
       63
        
       

     

       49
       49
       -
         mvnParameters = toString [

     

       50
       50
       -
           "-DskipTests=true" # skip tests (out of memory exceptions)

     

       51
       51
       -
           "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream)

     

       52
       52
       -
         ];

     

       64
       64
       +
         mvnParameters = toString (

     

       65
       65
       +
           [

     

       66
       66
       +
             "-DskipTests=true" # skip tests (out of memory exceptions)

     

       67
       67
       +
             "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream)

     

       68
       68
       +
           ]

     

       69
       69
       +
           ++ lib.optionals (!enableGui) [

     

       70
       70
       +
             "-am -pl :tika-server-standard"

     

       71
       71
       +
           ]

     

       72
       72
       +
         );

     

       53
       73
        
       

     

       54
       74
        
         nativeBuildInputs = [ makeWrapper ];

     

       55
       75
        
       

     

       56
       76
        
         installPhase =

     

       57
       77
        
           let

     

       58
       58
       -
             binPath = lib.makeBinPath ([ jdk8.jre ] ++ lib.optionals enableOcr [ tesseract ]);

     

       78
       78
       +
             flags = "--add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED";

     

       79
       79
       +
       

     

       80
       80
       +
             binPath = lib.makeBinPath (

     

       81
       81
       +
               [

     

       82
       82
       +
                 (runCommand "jdk-tika"

     

       83
       83
       +
                   {

     

       84
       84
       +
                     nativeBuildInputs = [ makeWrapper ];

     

       85
       85
       +
                   }

     

       86
       86
       +
                   ''

     

       87
       87
       +
                     makeWrapper ${jdk}/bin/java $out/bin/java \

     

       88
       88
       +
                       --add-flags "${flags}"

     

       89
       89
       +
                   ''

     

       90
       90
       +
                 )

     

       91
       91
       +
               ]

     

       92
       92
       +
               ++ lib.optionals enableOcr [ tesseract ]

     

       93
       93
       +
             );

     

       59
       94
        
           in

     

       60
       95
        
           ''

     

       61
       96
        
             runHook preInstall

     

       62
       97
        
       

     

       63
       98
        
             # Note: using * instead of version would match multiple files

     

       99
       99
       +
           ''

     

       100
       100
       +
           + lib.optionalString enableGui ''

     

       64
       101
        
             install -Dm644 tika-app/target/tika-app-${version}.jar $out/share/tika/tika-app.jar

     

       102
       102
       +
             makeWrapper ${jdk}/bin/java $out/bin/tika-app \

     

       103
       103
       +
                 --add-flags "${flags} -jar $out/share/tika/tika-app.jar"

     

       104
       104
       +
           ''

     

       105
       105
       +
           + ''

     

       65
       106
        
             install -Dm644 tika-server/tika-server-standard/target/tika-server-standard-${version}.jar $out/share/tika/tika-server.jar

     

       66
       66
       -
       

     

       67
       67
       -
             makeWrapper ${jdk8.jre}/bin/java $out/bin/tika-app \

     

       68
       68
       -
                 --add-flags "-jar $out/share/tika/tika-app.jar"

     

       69
       69
       -
             makeWrapper ${jdk8.jre}/bin/java $out/bin/tika-server \

     

       107
       107
       +
             makeWrapper ${jdk}/bin/java $out/bin/tika-server \

     

       70
       108
        
                 --prefix PATH : ${binPath} \

     

       71
       109
        
                 --add-flags "-jar $out/share/tika/tika-server.jar"

     

       72
       110