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.

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

josm: fix package #87254

Closed
wants to merge 1 commit into from
Closed

josm: fix package #87254

wants to merge 1 commit into from

Conversation

sikmir
Copy link
Member

@sikmir sikmir commented May 8, 2020 •
edited

Motivation for this change

Changelog:

  • darwin: use official MacOS package
  • darwin: don't install .desktop file
  • linux: use .desktop file from upstream svn repo
  • linux: install man file, hicolor icons
  • linux: added -Djosm.restart=true -Djava.net.useSystemProxies=true flags
  • linux: make it possible to override jre (jre = jdk11 is default)
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • linux (+217 KB)
$ nix path-info -S ./result
/nix/store/29lmrxwv12h8kaxg91jqksjm99b0piin-josm-16239	1165843352
$ nix path-info -S ./result
/nix/store/hkwz2096ymg1ykj9ia0l4kkmyamdyn39-josm-16239	1166060328
  • darwin (-358 MB)
$ nix path-info -S ./result
/nix/store/4b9vylj6h54x6lb2lyxkgjq0xmf5i2hq-josm-16239	  373218592
$ nix path-info -S ./result
/nix/store/fn5r4vyr800vxk112m5wm1247jgfr6n5-josm-16239	   15304816

@sikmir sikmir requested a review from rycee May 8, 2020 10:53
Mic92
Mic92 reviewed May 8, 2020
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -20158,7 +20158,7 @@ in

joe = callPackage ../applications/editors/joe { };

josm = callPackage ../applications/misc/josm { };
josm = callPackage ../applications/misc/josm { jre = jdk11; };
Copy link
Member

Choose a reason for hiding this comment

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

Why does it use actually jdk instead of jre?

Copy link
Member Author

@sikmir sikmir May 8, 2020 •
edited

Choose a reason for hiding this comment

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

Since we have no jre11 alias or jdk11.jre, only jre = jre8. Version 11 is preferable for JOSM.

Copy link
Member Author

Choose a reason for hiding this comment

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

There are 3 other packages in all-packages.nix that use jre = openjdk11 as well.

@rycee
Copy link
Member

rycee commented May 8, 2020

I can't vouch for the macos part but it works very well for me on NixOS. Thanks! Rebased to master in 61812d5.

@rycee rycee closed this May 8, 2020
@sikmir sikmir deleted the josm branch May 8, 2020 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@rycee rycee Awaiting requested review from rycee

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sikmir @rycee @Mic92