cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

jabref: 5.11 -> 5.12

Browse source
This commit is contained in:
linsui 2024-01-18 14:13:11 +08:00
parent 694767ccd2
commit d5300aa760
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/applications/office/jabref/default.nix
View file

@ -2,7 +2,6 @@
, stdenv , stdenv
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, wrapGAppsHook , wrapGAppsHook
, makeDesktopItem , makeDesktopItem
, copyDesktopItems , copyDesktopItems
@ -22,16 +21,20 @@ let
pin = "2.2.1-20230117.075740-16"; 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.11"; version = "5.12";
pname = "jabref"; pname = "jabref";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JabRef"; owner = "JabRef";
repo = "jabref"; repo = "jabref";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MTnM4QHTFXJt/T8SOWwHlZ1CuegSGjpT3qDaMRi5n18="; hash = "sha256-+ltd9hItmMkEpKzX6TFfFy5fiOkLBK/tQNsh8OVDeoc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -51,7 +54,7 @@ stdenv.mkDerivation rec {
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
pname = "${pname}-deps"; pname = "${pname}-deps";
inherit src version patches postPatch; inherit src version postPatch;
nativeBuildInputs = [ gradle perl ]; nativeBuildInputs = [ gradle perl ];
buildPhase = '' buildPhase = ''
@ -61,26 +64,20 @@ stdenv.mkDerivation rec {
''; '';
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = '' installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ find $GRADLE_USER_HOME/caches/modules-2/ -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
| sh | sh
mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \
$out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} $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/ # Don't move info to share/
forceShare = [ "dummy" ]; forceShare = [ "dummy" ];
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "sha256-sMbAv122EcLPOqbEVKowfxp9B71iJaccLRlKS75b3Xc="; outputHash = "sha256-baP/zNgcc6oYwwbWvT7ontULcKKCw0rTQRkdZMgcWfY=";
}; };
patches = [
# Use JavaFX 21
(fetchpatch {
url = "https://github.com/JabRef/jabref/commit/2afd1f622a3ab85fc2cf5fa879c5a4d41c245eca.patch";
hash = "sha256-cs7TSSnEY4Yf5xrqMOpfIA4jVdzM3OQQV/anQxJyy64=";
})
];
postPatch = '' postPatch = ''
# Pin the version # Pin the version
substituteInPlace build.gradle \ substituteInPlace build.gradle \
@ -92,6 +89,13 @@ stdenv.mkDerivation rec {
--replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \ --replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \
'VERSION_CHECK_ENABLED, Boolean.FALSE' 'VERSION_CHECK_ENABLED, Boolean.FALSE'
# Find OpenOffice/LibreOffice binary
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 # Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326
cat <<EOF >> build.gradle cat <<EOF >> build.gradle
task downloadDependencies { task downloadDependencies {
@ -152,7 +156,7 @@ stdenv.mkDerivation rec {
runHook preInstall runHook preInstall
install -dm755 $out/share/java/jabref install -dm755 $out/share/java/jabref
install -Dm644 LICENSE.md $out/share/licenses/jabref/LICENSE.md install -Dm644 LICENSE $out/share/licenses/jabref/LICENSE
install -Dm644 src/main/resources/icons/jabref.svg $out/share/pixmaps/jabref.svg install -Dm644 src/main/resources/icons/jabref.svg $out/share/pixmaps/jabref.svg
# script to support browser extensions # script to support browser extensions