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

antlr: symlink jar instead of copying #293178

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Conversation

katrinafyi
Copy link
Member

@katrinafyi katrinafyi commented Mar 4, 2024

This separates the antlr-4.13.0-complete.jar file from antlr package which creates wrapper scripts.
With this separation, we can use the jar by itself without pulling in a whole Java runtime.
This is useful when the jar needs to be used in other environments.

Description of changes

Link instead of copy in the installPhase, and jarLocation is changed to use the .jar file directly instead of from the wrapper package.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

this also allows for using the jarLocation as a standalone file without pulling in a Java runtime from the wrapper scripts.
@katrinafyi
Copy link
Member Author

@NickCao are you the right person for antlr (there's no-one in maintainers)?

What do you think? The rebuilds can also be reduced if we only change jarLocation and not antlr (at the very small cost of duplicating the small jar file).

@NickCao
Copy link
Member

NickCao commented Mar 5, 2024

I like this idea, and frankly less than 100 rebuilds ain't much.

@NickCao
Copy link
Member

NickCao commented Mar 5, 2024

Result of nixpkgs-review pr 293178 run on x86_64-linux 1

8 packages marked as broken and skipped:
  • python312Packages.explorerscript
  • python312Packages.explorerscript.dist
  • python312Packages.skytemple-dtef
  • python312Packages.skytemple-dtef.dist
  • python312Packages.skytemple-files
  • python312Packages.skytemple-files.dist
  • python312Packages.skytemple-ssb-debugger
  • python312Packages.skytemple-ssb-debugger.dist
9 packages failed to build:
  • mysql-workbench
  • python312Packages.hydra-core
  • python312Packages.hydra-core.dist
  • python312Packages.nocturne
  • python312Packages.nocturne.dist
  • python312Packages.omegaconf
  • python312Packages.omegaconf.dist
  • python312Packages.qiling
  • python312Packages.qiling.dist
46 packages built:
  • antlr (antlr4 ,antlr4_13)
  • antlr4_10
  • antlr4_11
  • antlr4_12
  • antlr4_8
  • antlr4_9
  • dvc (python311Packages.dvc)
  • dvc-with-remotes
  • dvc-with-remotes.dist
  • dvc.dist (python311Packages.dvc.dist)
  • python311Packages.detectron2
  • python311Packages.detectron2.dist
  • python311Packages.dvc-gdrive
  • python311Packages.dvc-gdrive.dist
  • python311Packages.dvc-hdfs
  • python311Packages.dvc-hdfs.dist
  • python311Packages.dvclive
  • python311Packages.dvclive.dist
  • python311Packages.effdet
  • python311Packages.effdet.dist
  • python311Packages.explorerscript
  • python311Packages.explorerscript.dist
  • python311Packages.hydra-core
  • python311Packages.hydra-core.dist
  • python311Packages.nocturne
  • python311Packages.nocturne.dist
  • python311Packages.omegaconf
  • python311Packages.omegaconf.dist
  • python311Packages.pyannote-audio
  • python311Packages.pyannote-audio.dist
  • python311Packages.python-fx
  • python311Packages.python-fx.dist
  • python311Packages.qiling
  • python311Packages.qiling.dist
  • python311Packages.skytemple-dtef
  • python311Packages.skytemple-dtef.dist
  • python311Packages.skytemple-files
  • python311Packages.skytemple-files.dist
  • python311Packages.skytemple-ssb-debugger
  • python311Packages.skytemple-ssb-debugger.dist
  • python312Packages.python-fx
  • python312Packages.python-fx.dist
  • skytemple
  • skytemple.dist
  • surelog
  • yosys-synlig

@NickCao NickCao merged commit 6d38aff into NixOS:master Mar 5, 2024
27 checks passed
@katrinafyi katrinafyi deleted the patch-1 branch March 5, 2024 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants