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

antlr4_13: init at 4.13.0 and set as default #238543

Merged
merged 3 commits into from
Sep 3, 2023
Merged

Conversation

NickCao
Copy link
Member

@NickCao NickCao commented Jun 19, 2023

Description of changes
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.11 Release Notes (or backporting 23.05 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.

@NickCao
Copy link
Member Author

NickCao commented Jun 19, 2023

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

2 packages failed to build:
  • python311Packages.dvclive
  • python311Packages.dvclive.dist
55 packages built:
  • antlr
  • antlr4_12
  • azure-cli
  • azure-cli.dist
  • baserow
  • baserow.dist
  • dvc
  • dvc-with-remotes
  • dvc-with-remotes.dist
  • dvc.dist
  • python310Packages.antlr4-python3-runtime
  • python310Packages.antlr4-python3-runtime.dist
  • python310Packages.dvclive
  • python310Packages.dvclive.dist
  • python310Packages.explorerscript
  • python310Packages.explorerscript.dist
  • python310Packages.hydra-core
  • python310Packages.hydra-core.dist
  • python310Packages.nocturne
  • python310Packages.nocturne.dist
  • python310Packages.omegaconf
  • python310Packages.omegaconf.dist
  • python310Packages.python-fx
  • python310Packages.python-fx.dist
  • python310Packages.qiling
  • python310Packages.qiling.dist
  • python310Packages.skytemple-dtef
  • python310Packages.skytemple-dtef.dist
  • python310Packages.skytemple-files
  • python310Packages.skytemple-files.dist
  • python310Packages.skytemple-ssb-debugger
  • python310Packages.skytemple-ssb-debugger.dist
  • python311Packages.antlr4-python3-runtime
  • python311Packages.antlr4-python3-runtime.dist
  • python311Packages.explorerscript
  • python311Packages.explorerscript.dist
  • python311Packages.hydra-core
  • python311Packages.hydra-core.dist
  • python311Packages.nocturne
  • python311Packages.nocturne.dist
  • python311Packages.omegaconf
  • python311Packages.omegaconf.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
  • skytemple
  • skytemple.dist
  • surelog

nativeBuildInputs = [
setuptools
];

# in 4.9, test was renamed to tests
Copy link
Contributor

Choose a reason for hiding this comment

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

I know this is not strictly related to your patch. Could you explain why is this cd test* not cd tests? Is this expression meant to be compatible with multiple antlr versions? If not, the asterisk could be removed.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think the comment pretty much has explained it, so the folder is named test pre 4.9, but tests since 4.9.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the comment pretty much has explained it, so the folder is named test pre 4.9, but tests since 4.9.

@NickCao what I tried to propose, is that perhaps because this expression is used with only a single antlr4.runtime.cpp.src, the asterisk could be removed.

Copy link
Member Author

@NickCao NickCao Sep 3, 2023

Choose a reason for hiding this comment

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

But it can (and is) used with other versions of antlr, see pkgs/servers/baserow/default.nix for example.

Copy link
Contributor

Choose a reason for hiding this comment

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

But it can (and is) used with other versions of antlr, see pkgs/servers/baserow/default.nix for example.

I see, than in that case, let's write this detail in the comment, something like:

Suggested change
# in 4.9, test was renamed to tests
# We use an asterisk because this expression is used also for old antlr
# versions, where there the tests directory is `tests` and not `test`. See
# e.g in package `baserow`.

@doronbehar
Copy link
Contributor

Looks pretty good so far! I very much appreciate PRs that make the latest version the default version. Could you please run another nixpkgs-review run? and report the results? I wonder how other packages would handle this change after #248866 .

@NickCao NickCao force-pushed the antlr branch 2 times, most recently from 4e5a5ba to b80aa60 Compare September 3, 2023 13:03
@NickCao
Copy link
Member Author

NickCao commented Sep 3, 2023

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

4 packages failed to build:
  • python310Packages.fairseq
  • python310Packages.fairseq.dist
  • python311Packages.fairseq
  • python311Packages.fairseq.dist
72 packages built:
  • antlr
  • antlr4_12
  • azure-cli
  • azure-cli.dist
  • baserow
  • baserow.dist
  • dvc (python310Packages.dvc)
  • dvc-with-remotes
  • dvc-with-remotes.dist
  • dvc.dist (python310Packages.dvc.dist)
  • python310Packages.antlr4-python3-runtime
  • python310Packages.antlr4-python3-runtime.dist
  • python310Packages.detectron2
  • python310Packages.detectron2.dist
  • python310Packages.dvclive
  • python310Packages.dvclive.dist
  • python310Packages.effdet
  • python310Packages.effdet.dist
  • python310Packages.explorerscript
  • python310Packages.explorerscript.dist
  • python310Packages.hydra-core
  • python310Packages.hydra-core.dist
  • python310Packages.nocturne
  • python310Packages.nocturne.dist
  • python310Packages.omegaconf
  • python310Packages.omegaconf.dist
  • python310Packages.python-fx
  • python310Packages.python-fx.dist
  • python310Packages.qiling
  • python310Packages.qiling.dist
  • python310Packages.skytemple-dtef
  • python310Packages.skytemple-dtef.dist
  • python310Packages.skytemple-files
  • python310Packages.skytemple-files.dist
  • python310Packages.skytemple-ssb-debugger
  • python310Packages.skytemple-ssb-debugger.dist
  • python310Packages.unstructured-inference
  • python310Packages.unstructured-inference.dist
  • python311Packages.antlr4-python3-runtime
  • python311Packages.antlr4-python3-runtime.dist
  • python311Packages.detectron2
  • python311Packages.detectron2.dist
  • python311Packages.dvc
  • python311Packages.dvc.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.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
  • python311Packages.unstructured-inference
  • python311Packages.unstructured-inference.dist
  • skytemple
  • skytemple.dist
  • surelog
  • unstructured-api

@NickCao
Copy link
Member Author

NickCao commented Sep 3, 2023

fairseq is broken on master: https://hydra.nixos.org/eval/1798993?filter=fairseq

@doronbehar
Copy link
Contributor

Good to merge when CI is green.

@NickCao NickCao merged commit dd0b7e3 into NixOS:master Sep 3, 2023
@NickCao NickCao deleted the antlr branch September 3, 2023 15:04
@hzeller hzeller mentioned this pull request Nov 20, 2024
13 tasks
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