From 79833127caf9f94006418c758fb9b51ef773c9b9 Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 23 Sep 2022 12:51:12 +0800 Subject: [PATCH] jabref: 5.6 -> 5.7 --- pkgs/applications/office/jabref/default.nix | 50 +++-- .../office/jabref/gradle.lockfile | 180 ------------------ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 26 insertions(+), 208 deletions(-) delete mode 100644 pkgs/applications/office/jabref/gradle.lockfile diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index fe481d3f51b4..a7b5a39d72f6 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -13,25 +13,27 @@ }: stdenv.mkDerivation rec { - version = "5.6"; + version = "5.7"; pname = "jabref"; src = fetchFromGitHub { owner = "JabRef"; repo = "jabref"; rev = "v${version}"; - hash = "sha256-w3F1td7KmdSor/2vKar3w17bChe1yH7JMobOaCjZqd4="; + hash = "sha256-wzBaAaxGsMPh64uW+bBOiycYfVCW9H5FCn06r6XdxeE="; }; desktopItems = [ (makeDesktopItem { comment = meta.description; - name = "jabref"; + name = "JabRef %U"; desktopName = "JabRef"; genericName = "Bibliography manager"; categories = [ "Office" ]; icon = "jabref"; - exec = "jabref"; + exec = "JabRef"; + startupWMClass = "org.jabref.gui.JabRefMain"; + mimeTypes = [ "text/x-bibtex" ]; }) ]; @@ -39,12 +41,6 @@ stdenv.mkDerivation rec { pname = "${pname}-deps"; inherit src version; - postPatch = '' - sed -i -e '/testImplementation/d' -e '/testRuntimeOnly/d' build.gradle - echo 'dependencyLocking { lockAllConfigurations() }' >> build.gradle - cp ${./gradle.lockfile} ./ - ''; - nativeBuildInputs = [ gradle perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -60,8 +56,8 @@ stdenv.mkDerivation rec { forceShare = [ "dummy" ]; outputHashMode = "recursive"; outputHash = { - x86_64-linux = "sha256-ySGXZM9LCJUjGCrKMc+5I6duEbmSsp3tU3t/o5nM+5M="; - aarch64-linux = "sha256-mfWyGGBqjRQ8q9ddR57O2rwtby2T1H6Ra2m0JGVZ1Zs="; + x86_64-linux = "sha256-OicHJVFxHGPE76bEDoLhkEhVcAJmplqjoh2I3nnVaLA="; + aarch64-linux = "sha256-8QWmweptL/+pSO6DhfBLaLcBrfKd4TDsDoXs4TgXvew="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); }; @@ -95,11 +91,14 @@ stdenv.mkDerivation rec { --no-daemon \ -PprojVersion="${version}" \ -PprojVersionInfo="${version} NixOS" \ + -Dorg.gradle.java.home=${jdk} \ assemble runHook postBuild ''; + dontWrapGApps = true; + installPhase = '' runHook preInstall @@ -109,8 +108,6 @@ stdenv.mkDerivation rec { # script to support browser extensions install -Dm755 buildres/linux/jabrefHost.py $out/lib/jabrefHost.py - # This can be removed in the next version - sed -i -e "/importBibtex/s/{}/'{}'/" $out/lib/jabrefHost.py install -Dm644 buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json sed -i -e "s|/opt/jabref|$out|" $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json @@ -119,31 +116,30 @@ stdenv.mkDerivation rec { # workaround for https://github.com/NixOS/nixpkgs/issues/162064 tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1 - unzip $out/lib/javafx-web-18-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/ + unzip $out/lib/javafx-web-*-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/ + + DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g') + rm $out/bin/* + + makeWrapper ${jdk}/bin/java $out/bin/JabRef \ + "''${gappsWrapperArgs[@]}" \ + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --add-flags "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main" \ + --add-flags "$DEFAULT_JVM_OPTS" # lowercase alias (for convenience and required for browser extensions) ln -sf $out/bin/JabRef $out/bin/jabref - rm $out/bin/JabRef.bat - runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - --set JAVA_HOME "${jdk}" - --set JAVA_OPTS "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main" - ) - ''; - meta = with lib; { description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # source bundles dependencies as jars - binaryNativeCode # source bundles dependencies as jars + binaryBytecode # source bundles dependencies as jars + binaryNativeCode # source bundles dependencies as jars ]; license = licenses.gpl2; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/office/jabref/gradle.lockfile b/pkgs/applications/office/jabref/gradle.lockfile deleted file mode 100644 index 560420fb6ef2..000000000000 --- a/pkgs/applications/office/jabref/gradle.lockfile +++ /dev/null @@ -1,180 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -classworlds:classworlds:1.1-alpha-2=modernizer -com.fasterxml.jackson.core:jackson-annotations:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.tomtung:latex2unicode_2.12:0.2.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.code.findbugs:jsr305:3.0.2=checkstyle -com.google.code.gson:gson:2.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.11.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:31.1-jre=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.googlecode.javaewah:JavaEWAH:1.1.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.h2database:h2-mvstore:2.1.212=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.ibm.icu:icu4j-charset:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.ibm.icu:icu4j:69.1=antlr4 -com.ibm.icu:icu4j:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.jfoenix:jfoenix:9.0.10=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.konghq:unirest-java:3.13.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.microsoft.azure:applicationinsights-core:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.oracle.ojdbc:ojdbc10:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.oracle.ojdbc:ons:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.oracle.ojdbc:osdt_cert:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.oracle.ojdbc:osdt_core:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.oracle.ojdbc:simplefan:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.oracle.ojdbc:ucp:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:10.1=checkstyle -com.sun.activation:jakarta.activation:2.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc -com.sun.istack:istack-commons-runtime:4.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc -com.sun.istack:istack-commons-tools:4.0.1=xjc -com.sun.xml.bind.external:relaxng-datatype:3.0.2=xjc -com.sun.xml.bind.external:rngom:3.0.2=xjc -com.sun.xml.dtd-parser:dtd-parser:1.4.5=xjc -com.tobiasdiez:easybind:2.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-ast:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-builder:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-collection:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-data:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-dependency:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-format:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-html:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-misc:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-options:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-sequence:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util-visitor:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark-util:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.vladsch.flexmark:flexmark:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-cli:commons-cli:1.5.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-collections:commons-collections:3.2.2=checkstyle -commons-io:commons-io:2.11.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-logging:commons-logging:1.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -de.saxsys:mvvmfx:1.8.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -de.undercouch:citeproc-java:3.0.0-alpha.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -eu.lestard:doc-annotations:0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -info.debatty:java-string-similarity:2.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -info.picocli:picocli:4.6.3=checkstyle -io.github.java-diff-utils:java-diff-utils:4.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.annotation:jakarta.annotation-api:1.3.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc -junit:junit:3.8.1=modernizer -net.harawata:appdirs:1.2.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.jcip:jcip-annotations:1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.jodah:typetools:0.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.sf.jopt-simple:jopt-simple:4.6=jmh,jmhCompileClasspath,jmhRuntimeClasspath -net.sf.saxon:Saxon-HE:10.6=checkstyle -org.abego.treelayout:org.abego.treelayout.core:1.0.3=antlr4 -org.antlr:ST4:4.3.1=antlr3,antlr4 -org.antlr:antlr-runtime:3.5.2=antlr4,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.antlr:antlr-runtime:3.5.3=antlr3 -org.antlr:antlr4-runtime:4.9.3=antlr4,checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.antlr:antlr4:4.9.3=antlr4 -org.antlr:antlr:3.5.3=antlr3 -org.apache.commons:commons-csv:1.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-lang3:3.12.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-math3:3.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath -org.apache.commons:commons-text:1.9=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpasyncclient:4.1.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore-nio:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpmime:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-analysis-common:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-core:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-highlighter:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-memory:9.1.0=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.apache.lucene:lucene-queries:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-queryparser:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-sandbox:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.maven.wagon:wagon-provider-api:1.0-beta-2=modernizer -org.apache.maven:maven-artifact-manager:2.0.9=modernizer -org.apache.maven:maven-artifact:2.0.9=modernizer -org.apache.maven:maven-model:2.0.9=modernizer -org.apache.maven:maven-plugin-api:2.0=modernizer -org.apache.maven:maven-plugin-registry:2.0.9=modernizer -org.apache.maven:maven-profile:2.0.9=modernizer -org.apache.maven:maven-project:2.0.9=modernizer -org.apache.maven:maven-repository-metadata:2.0.9=modernizer -org.apache.maven:maven-settings:2.0.9=modernizer -org.apache.pdfbox:fontbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:pdfbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.pdfbox:xmpbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.tika:tika-core:2.3.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.bouncycastle:bcprov-jdk15on:1.70=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.12.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=modernizer -org.controlsfx:controlsfx:11.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fxmisc.flowless:flowless:0.6.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fxmisc.richtext:richtextfx:0.10.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fxmisc.undo:undofx:2.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fxmisc.wellbehaved:wellbehavedfx:0.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.gaul:modernizer-maven-annotations:2.3.0=modernizer -org.gaul:modernizer-maven-plugin:2.3.0=modernizer -org.glassfish.hk2.external:jakarta.inject:2.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:codemodel:3.0.2=xjc -org.glassfish.jaxb:jaxb-core:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc -org.glassfish.jaxb:jaxb-runtime:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc -org.glassfish.jaxb:jaxb-xjc:3.0.2=xjc -org.glassfish.jaxb:txw2:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc -org.glassfish.jaxb:xsom:3.0.2=xjc -org.glassfish:javax.json:1.0.4=antlr4 -org.jacoco:org.jacoco.agent:0.8.7=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.7=jacocoAnt -org.jacoco:org.jacoco.core:0.8.7=jacocoAnt -org.jacoco:org.jacoco.report:0.8.7=jacocoAnt -org.javassist:javassist:3.28.0-GA=checkstyle -org.jbibtex:jbibtex:1.0.19=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains:annotations:15.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jsoup:jsoup:1.14.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.kordamp.ikonli:ikonli-core:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.kordamp.ikonli:ikonli-javafx:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.libreoffice:libreoffice:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.libreoffice:unoloader:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.mariadb.jdbc:mariadb-java-client:2.7.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.openjdk.jmh:jmh-core:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath -org.openjdk.jmh:jmh-generator-asm:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath -org.openjdk.jmh:jmh-generator-bytecode:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath -org.openjdk.jmh:jmh-generator-reflection:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath -org.openjfx:javafx-base:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.openjfx:javafx-controls:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.openjfx:javafx-fxml:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.openjfx:javafx-graphics:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.openjfx:javafx-media:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.openjfx:javafx-swing:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.openjfx:javafx-web:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.1=jacocoAnt -org.ow2.asm:asm-analysis:9.2=modernizer -org.ow2.asm:asm-commons:9.1=jacocoAnt -org.ow2.asm:asm-commons:9.2=modernizer -org.ow2.asm:asm-tree:9.1=jacocoAnt -org.ow2.asm:asm-tree:9.2=modernizer -org.ow2.asm:asm:5.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath -org.ow2.asm:asm:9.1=jacocoAnt -org.ow2.asm:asm:9.2=modernizer -org.postgresql:postgresql:42.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.reactfx:reactfx:2.0-M5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.reflections:reflections:0.10.2=checkstyle -org.scala-lang:scala-library:2.12.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0-alpha7=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tinylog:slf4j-tinylog:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tinylog:tinylog-api:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tinylog:tinylog-impl:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.yaml:snakeyaml:1.30=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,jmhAnnotationProcessor,testAnnotationProcessor diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff3535c7c78d..5692807d8a91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28995,7 +28995,9 @@ with pkgs; subproject = "reader"; }; - jabref = callPackage ../applications/office/jabref { }; + jabref = callPackage ../applications/office/jabref { + jdk = jdk18; + }; jack_capture = callPackage ../applications/audio/jack-capture { };