jabref: 5.12 -> 5.13

linsui 20edaf9a a49ac031

+10 -22
+6 -20
pkgs/applications/office/jabref/default.nix
··· 1 1 { lib 2 2 , stdenv 3 - , fetchurl 4 3 , fetchFromGitHub 5 4 , wrapGAppsHook3 6 5 , makeDesktopItem ··· 21 20 pin = "2.2.1-20230117.075740-16"; 22 21 }; 23 22 }; 24 - jackson-datatype-jsr310 = fetchurl { 25 - url = "https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.15.3/jackson-datatype-jsr310-2.15.3.jar"; 26 - hash = "sha256-vqHXgAnrxOXVSRij967F2p+9CfZiwZGiF//PN+hSfF4="; 27 - }; 28 23 in 29 24 stdenv.mkDerivation rec { 30 - version = "5.12"; 25 + version = "5.13"; 31 26 pname = "jabref"; 32 27 33 28 src = fetchFromGitHub { 34 29 owner = "JabRef"; 35 30 repo = "jabref"; 36 31 rev = "v${version}"; 37 - hash = "sha256-+ltd9hItmMkEpKzX6TFfFy5fiOkLBK/tQNsh8OVDeoc="; 32 + hash = "sha256-inE2FXAaEEiq7343KwtjEiTEHLtn01AzP0foTpsLoAw="; 38 33 fetchSubmodules = true; 39 34 }; 40 35 ··· 47 42 categories = [ "Office" ]; 48 43 icon = "jabref"; 49 44 exec = "JabRef %U"; 50 - startupWMClass = "org.jabref.gui.JabRefMain"; 45 + startupWMClass = "org.jabref.gui.JabRefGUI"; 51 46 mimeTypes = [ "text/x-bibtex" ]; 52 47 }) 53 48 ]; ··· 69 64 | sh 70 65 mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ 71 66 $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} 72 - # This is used but not cached by Gradle. 73 - cp ${jackson-datatype-jsr310} $out/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.15.3/jackson-datatype-jsr310-2.15.3.jar 74 67 ''; 75 68 # Don't move info to share/ 76 69 forceShare = [ "dummy" ]; 77 70 outputHashMode = "recursive"; 78 - outputHash = "sha256-baP/zNgcc6oYwwbWvT7ontULcKKCw0rTQRkdZMgcWfY="; 71 + outputHash = "sha256-lpFIhvPgkzIsHR6IVnn+oPhdSjo0yOIw7USo2+SJCVQ="; 79 72 }; 80 73 81 74 postPatch = '' ··· 92 85 # Find OpenOffice/LibreOffice binary 93 86 substituteInPlace src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java \ 94 87 --replace '/usr' '/run/current-system/sw' 95 - 96 - # Don't fetch predatory sources. These source are fetched from online webpages. 97 - sed -i -e '/new PJSource/,/);/c);' src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListCrawler.java 98 88 99 89 # Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326 100 90 cat <<EOF >> build.gradle ··· 117 107 118 108 preBuild = '' 119 109 # Use the local packages from -deps 120 - sed -i -e '/repositories {/a maven { url uri("${deps}") }' \ 121 - build.gradle \ 122 - settings.gradle 110 + sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle 111 + sed -i -e '1i pluginManagement { repositories { maven { url uri("${deps}") } } }' settings.gradle 123 112 ''; 124 113 125 114 nativeBuildInputs = [ ··· 169 158 cp -r build/resources $out/share/java/jabref 170 159 171 160 tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1 172 - 173 - # workaround for https://github.com/NixOS/nixpkgs/issues/162064 174 - unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/ 175 161 176 162 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') 177 163
+4 -2
pkgs/top-level/all-packages.nix
··· 32010 32010 }; 32011 32011 32012 32012 jabref = callPackage ../applications/office/jabref { 32013 - jdk = jdk21.override { enableJavaFX = true; }; 32014 - gradle = gradle_8; 32013 + jdk = jdk.override { 32014 + enableJavaFX = true; 32015 + openjfx = openjfx22.override { withWebKit = true; }; 32016 + }; 32015 32017 }; 32016 32018 32017 32019 jack_capture = callPackage ../applications/audio/jack-capture { };