Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jabref: 5.7 -> 5.9 #205299

Merged
merged 1 commit into from
Mar 11, 2023
Merged

jabref: 5.7 -> 5.9 #205299

merged 1 commit into from
Mar 11, 2023

Conversation

linsui
Copy link
Contributor

@linsui linsui commented Dec 9, 2022 •
edited
Loading

Description of changes

Closes #220470

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from gebner December 9, 2022 12:59
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Dec 9, 2022
tjni
tjni reviewed Dec 9, 2022
View reviewed changes
Copy link
Contributor

@tjni tjni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Reviewing because it helps me learn more about now nix packages Java apps.

Think this is the best way forward right now, while JabRef/jabref#9417 is still open.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/745

@wamserma
Copy link
Member

Upstream rolled back to JDK17 and released v5.8. Maybe this PR can be dropped after bumping JabRef.

@linsui
Copy link
Contributor Author

linsui commented Dec 24, 2022

I failed to build 5.8. I'd like to get this merged first.

@linsui linsui mentioned this pull request Jan 9, 2023
Closed
13 tasks
@linsui
Copy link
Contributor Author

linsui commented Jan 10, 2023

@ofborg build jabref

@linsui linsui changed the title jabref: use jdk17 jabref: 5.7 -> 5.9 Jan 10, 2023
@wamserma
Copy link
Member

Fails (on Arm) because Gradle omits platform from paths:

> Could not find javafx-graphics-19-linux.jar (org.openjfx:javafx-graphics:19).
        Searched in the following locations:
            file:/nix/store/6lj10zcsavm3cdjcsmr78mqa190a7wvk-jabref-deps-5.9/org/openjfx/javafx-graphics/19/javafx-graphics-19-linux.jar

While the file is at

/nix/store/6lj10zcsavm3cdjcsmr78mqa190a7wvk-jabref-deps-5.9/org/openjfx/javafx-graphics/19/javafx-graphics-19-linux-aarch64.jar

@linsui
Copy link
Contributor Author

linsui commented Jan 10, 2023

Is this a new problem? javafx always has that suffix.

@wamserma
Copy link
Member

Is this a new problem? javafx always has that suffix.

Yes (see /nix/store/w3h510lpzvmrb4wacw796czhr1pkb7vj-jabref-deps-5.6/org/openjfx/javafx-graphics/18/), but JabRef 5.6 on 7e27b83 was able to build on aarch64-linux, so it is some issue introduced by either Gradle or the JabRef bump.

@linsui
Copy link
Contributor Author

linsui commented Jan 10, 2023

I don't have an arm device to test it. Is the linux.jar in the arm64 deps in 5.7 and 5.9? Does it work to run assemble directly on arm64 device? Maybe it's an error of the downloadDependencies task?

@linsui
Copy link
Contributor Author

linsui commented Jan 27, 2023

I marked the aarch64 as broken.

@Artturin
Copy link
Member

error: hash mismatch in fixed-output derivation '/nix/store/n2fqmfcisyaa1dbfdv41is8vs8gs9mm0-jabref-deps-5.9.drv':
specified: sha256-0kB9tass78987hK2lEG9cnEVdLUZqvSVt5WtltHdYyI=
got: sha256-2lVNdc+qdTmSCPLYQHwZM6zTKzzob980XtYIEux6Tnk=

@linsui
Copy link
Contributor Author

linsui commented Feb 8, 2023

Upstream uses some deps with snapshot versions in 5.9.

@linsui
Copy link
Contributor Author

linsui commented Mar 1, 2023

I patch the source to pin the snapshot versions. I don't know why but today jabref can't find some libs suddenly. I add them to LD_LIBRARY_PATH.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/852

SuperSandro2000
SuperSandro2000 reviewed Mar 3, 2023
View reviewed changes
pkgs/applications/office/jabref/default.nix Outdated
@@ -51,16 +53,24 @@ stdenv.mkDerivation rec {
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' \
| sh
mv $out/com/tobiasdiez/easybind/2.2.1-20230117.075740-16 $out/com/tobiasdiez/easybind/2.2.1-SNAPSHOT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should move this into a variable to prevent easy errors in the future

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean? Could you elaborate?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought I applied your suggestion. Please review it again.

@linsui
Copy link
Contributor Author

linsui commented Mar 4, 2023

It seems the missing lib problem is caused by #206643. When #219391 lands I'll try with enableJavaFX.

@linsui
Copy link
Contributor Author

linsui commented Mar 7, 2023

The missing lib problem is fixed. The arm build is fixed.

@linsui
Copy link
Contributor Author

linsui commented Mar 7, 2023

@ofborg build jabref

@linsui linsui mentioned this pull request Mar 10, 2023
Closed
@linsui
Copy link
Contributor Author

linsui commented Mar 11, 2023

@SuperSandro2000 Could you please merge this? JabRef has been more and more broken... Thanks!

@SuperSandro2000 SuperSandro2000 merged commit f0728b4 into NixOS:master Mar 11, 2023
@linsui linsui deleted the jabref branch March 11, 2023 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tjni tjni tjni left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@wamserma wamserma wamserma approved these changes

@gebner gebner Awaiting requested review from gebner

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

JFX program (Jabref) builds but won't run
6 participants
@linsui @nixos-discourse @wamserma @Artturin @tjni @SuperSandro2000