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

antlr: 4.7 -> 4.8 #102820

Merged
merged 2 commits into from Nov 4, 2020
Merged

antlr: 4.7 -> 4.8 #102820

merged 2 commits into from Nov 4, 2020

Conversation

guibou
Copy link
Contributor

@guibou guibou commented Nov 4, 2020

Motivation for this change

Update to new antlr 4.8

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" --> yes but I may do it wrongly because it says "no change detected".
  • 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) (same. 511.2 M)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

I tested the compilation of mysql-workbench which depends on antlr4_7 and also I tested a few antlr binaires as well as the jar on my project.

@guibou guibou requested a review from jonringer November 4, 2020 19:36
jonringer
jonringer reviewed Nov 4, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment •
edited

Choose a reason for hiding this comment

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

regression in azure-cli. Do you mind leaving the 4_7 package?

builder for '/nix/store/mij0zarqvrqwaa1c61dkq1lsj7cfycva-python3.7-azure-cli-2.14.0.drv' failed with exit code 1; last 10 log lines:
  Processing ./azure_cli-2.14.0-py3-none-any.whl
  Requirement already satisfied: azure-mgmt-reservations==0.6.0 in /nix/store/lrbr2qfvz277xd0y072gzlh9s5d2wcmr-python3.7-azure-mgmt-reservations-0.8.0/lib/python3.7/site-packages (from azure-cli==2.14.0) (0.6.0)
  Requirement already satisfied: websocket-client~=0.56.0 in /nix/store/j22x6k4qha7dyx56k85gpsylkjdf53x5-python3.7-websocket_client-0.56.0/lib/python3.7/site-packages (from azure-cli==2.14.0) (0.56.0)
  Requirement already satisfied: azure-mgmt-compute~=14.0 in /nix/store/6vyyg3y3wh1jfwxnji28w0h4qb3zsa73-python3.7-azure-mgmt-compute-17.0.0/lib/python3.7/site-packages (from azure-cli==2.14.0) (14.0.0)
  Requirement already satisfied: azure-mgmt-synapse~=0.3.0 in /nix/store/myjf2z8nvm6hwfba8knziz44wkm43s0b-python3.7-azure-mgmt-synapse-0.4.0/lib/python3.7/site-packages (from azure-cli==2.14.0) (0.3.0)
  Requirement already satisfied: azure-mgmt-imagebuilder~=0.4.0 in /nix/store/f8nl125m5bfhsffy0lhbhk717dv6d79b-python3.7-azure-mgmt-imagebuilder-0.4.0/lib/python3.7/site-packages (from azure-cli==2.14.0) (0.4.0)
  Requirement already satisfied: azure-mgmt-containerservice~=9.4.0 in /nix/store/1cpd30pvh11h8rgp33pdlaw001ry3j9x-python3.7-azure-mgmt-containerservice-10.0.0/lib/python3.7/site-packages (from azure-cli==2.14.0) (9.4.0)
  Requirement already satisfied: azure-mgmt-botservice~=0.2.0 in /nix/store/29a55fqkw9yv96d2cgyr452ngrwdfm8d-python3.7-azure-mgmt-botservice-0.2.0/lib/python3.7/site-packages (from azure-cli==2.14.0) (0.2.0)
  ERROR: Could not find a version that satisfies the requirement antlr4-python3-runtime~=4.7.2 (from azure-cli==2.14.0) (from versions: none)
  ERROR: No matching distribution found for antlr4-python3-runtime~=4.7.2 (from azure-cli==2.14.0)

I'm good with bumping antlr4 to be antlr4_8 though

@jonringer
Copy link
Contributor

actually, let me try just making them do antlr-python3-runtime~=4.7

@jonringer
Copy link
Contributor

do you mind applying this diff in a azure-cli: loosen antlr4 version bounds commit?

$ git diff
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index a7dd4a6ae82..5f636dcf747 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -23,6 +23,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
     substituteInPlace setup.py \
       --replace "javaproperties==0.5.1" "javaproperties" \
       --replace "pytz==2019.1" "pytz" \
+      --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \
       --replace "mock~=4.0" "mock"

@guibou
Copy link
Contributor Author

guibou commented Nov 4, 2020

@jonringer I've added the losen bound for azure-cli. I did not detected it because I basically greped for antlr4_7 in the repo. Thank you!

@guibou guibou requested a review from jonringer November 4, 2020 22:46
jonringer
jonringer approved these changes Nov 4, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 102820 1

6 packages built:
  • antlr4 (antlr4_8)
  • azure-cli
  • mysql-workbench
  • python27Packages.antlr4-python2-runtime
  • python37Packages.antlr4-python3-runtime
  • python38Packages.antlr4-python3-runtime

@jonringer jonringer merged commit 2de3de4 into NixOS:master Nov 4, 2020
@guibou guibou deleted the bump_antlr branch November 4, 2020 23:45
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 102820 run on x86_64-darwin 1

5 packages built:
  • antlr4 (antlr4_8)
  • azure-cli
  • python27Packages.antlr4-python2-runtime
  • python37Packages.antlr4-python3-runtime
  • python38Packages.antlr4-python3-runtime

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@guibou @jonringer @SuperSandro2000