jabref: 5.12 -> 5.13

This commit is contained in:
linsui 2024-05-15 13:50:29 +08:00
parent a49ac03100
commit 20edaf9a47
2 changed files with 10 additions and 22 deletions

View File

@ -1,6 +1,5 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, wrapGAppsHook3
, makeDesktopItem
@ -21,20 +20,16 @@ let
pin = "2.2.1-20230117.075740-16";
};
};
jackson-datatype-jsr310 = fetchurl {
url = "https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.15.3/jackson-datatype-jsr310-2.15.3.jar";
hash = "sha256-vqHXgAnrxOXVSRij967F2p+9CfZiwZGiF//PN+hSfF4=";
};
in
stdenv.mkDerivation rec {
version = "5.12";
version = "5.13";
pname = "jabref";
src = fetchFromGitHub {
owner = "JabRef";
repo = "jabref";
rev = "v${version}";
hash = "sha256-+ltd9hItmMkEpKzX6TFfFy5fiOkLBK/tQNsh8OVDeoc=";
hash = "sha256-inE2FXAaEEiq7343KwtjEiTEHLtn01AzP0foTpsLoAw=";
fetchSubmodules = true;
};
@ -47,7 +42,7 @@ stdenv.mkDerivation rec {
categories = [ "Office" ];
icon = "jabref";
exec = "JabRef %U";
startupWMClass = "org.jabref.gui.JabRefMain";
startupWMClass = "org.jabref.gui.JabRefGUI";
mimeTypes = [ "text/x-bibtex" ];
})
];
@ -69,13 +64,11 @@ stdenv.mkDerivation rec {
| sh
mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \
$out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot}
# This is used but not cached by Gradle.
cp ${jackson-datatype-jsr310} $out/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.15.3/jackson-datatype-jsr310-2.15.3.jar
'';
# Don't move info to share/
forceShare = [ "dummy" ];
outputHashMode = "recursive";
outputHash = "sha256-baP/zNgcc6oYwwbWvT7ontULcKKCw0rTQRkdZMgcWfY=";
outputHash = "sha256-lpFIhvPgkzIsHR6IVnn+oPhdSjo0yOIw7USo2+SJCVQ=";
};
postPatch = ''
@ -93,9 +86,6 @@ stdenv.mkDerivation rec {
substituteInPlace src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java \
--replace '/usr' '/run/current-system/sw'
# Don't fetch predatory sources. These source are fetched from online webpages.
sed -i -e '/new PJSource/,/);/c);' src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListCrawler.java
# Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326
cat <<EOF >> build.gradle
task downloadDependencies {
@ -117,9 +107,8 @@ stdenv.mkDerivation rec {
preBuild = ''
# Use the local packages from -deps
sed -i -e '/repositories {/a maven { url uri("${deps}") }' \
build.gradle \
settings.gradle
sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle
sed -i -e '1i pluginManagement { repositories { maven { url uri("${deps}") } } }' settings.gradle
'';
nativeBuildInputs = [
@ -170,9 +159,6 @@ stdenv.mkDerivation rec {
tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1
# workaround for https://github.com/NixOS/nixpkgs/issues/162064
unzip $out/lib/javafx-web-*-*.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')
runHook postInstall

View File

@ -32010,8 +32010,10 @@ with pkgs;
};
jabref = callPackage ../applications/office/jabref {
jdk = jdk21.override { enableJavaFX = true; };
gradle = gradle_8;
jdk = jdk.override {
enableJavaFX = true;
openjfx = openjfx22.override { withWebKit = true; };
};
};
jack_capture = callPackage ../applications/audio/jack-capture { };